73
72
_parse_revision_str,
75
74
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
80
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
81
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
83
return internal_tree_files(file_list, default_branch, canonicalize,
88
87
def tree_files_for_add(file_list):
153
152
# XXX: Bad function name; should possibly also be a class method of
154
153
# WorkingTree rather than a function.
154
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
156
apply_view=True):
157
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
Deprecated: use WorkingTree.open_containing_paths instead.
159
161
This is typically used for command-line processors that take one or
160
162
more filenames, and infer the workingtree that contains them.
172
174
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
223
182
def _get_view_info_for_change_reporter(tree):
194
def _open_directory_or_containing_tree_or_branch(filename, directory):
195
"""Open the tree or branch containing the specified file, unless
196
the --directory option is used to specify a different branch."""
197
if directory is not None:
198
return (None, Branch.open(directory), filename)
199
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
202
# TODO: Make sure no commands unconditionally use the working directory as a
236
203
# branch. If a filename argument is used, the first of them should be used to
237
204
# specify the branch. (Perhaps this can be factored out into some kind of
286
253
To skip the display of pending merge information altogether, use
287
254
the no-pending option or specify a file/directory.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
256
To compare the working directory to a specific revision, pass a
257
single revision to the revision argument.
259
To see which files have changed in a specific revision, or between
260
two revisions, pass a revision range to the revision argument.
261
This will produce the same results as calling 'bzr diff --summarize'.
293
264
# TODO: --no-recurse, --recurse options
353
324
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
327
def run(self, revision_id=None, revision=None, directory=u'.'):
357
328
if revision_id is not None and revision is not None:
358
329
raise errors.BzrCommandError('You can only supply one of'
359
330
' revision_id or --revision')
360
331
if revision_id is None and revision is None:
361
332
raise errors.BzrCommandError('You must supply either'
362
333
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
335
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
365
337
revisions = b.repository.revisions
366
338
if revisions is None:
511
488
d.destroy_workingtree()
491
class cmd_repair_workingtree(Command):
492
__doc__ = """Reset the working tree state file.
494
This is not meant to be used normally, but more as a way to recover from
495
filesystem corruption, etc. This rebuilds the working inventory back to a
496
'known good' state. Any new modifications (adding a file, renaming, etc)
497
will be lost, though modified files will still be detected as such.
499
Most users will want something more like "bzr revert" or "bzr update"
500
unless the state file has become corrupted.
502
By default this attempts to recover the current state by looking at the
503
headers of the state file. If the state file is too corrupted to even do
504
that, you can supply --revision to force the state of the tree.
507
takes_options = ['revision', 'directory',
509
help='Reset the tree even if it doesn\'t appear to be'
514
def run(self, revision=None, directory='.', force=False):
515
tree, _ = WorkingTree.open_containing(directory)
516
self.add_cleanup(tree.lock_tree_write().unlock)
520
except errors.BzrError:
521
pass # There seems to be a real error here, so we'll reset
524
raise errors.BzrCommandError(
525
'The tree does not appear to be corrupt. You probably'
526
' want "bzr revert" instead. Use "--force" if you are'
527
' sure you want to reset the working tree.')
531
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
533
tree.reset_state(revision_ids)
534
except errors.BzrError, e:
535
if revision_ids is None:
536
extra = (', the header appears corrupt, try passing -r -1'
537
' to set the state to the last commit')
540
raise errors.BzrCommandError('failed to reset the tree state'
514
544
class cmd_revno(Command):
515
545
__doc__ = """Show current revision number.
759
781
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
761
783
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)
784
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
785
self.add_cleanup(work_tree.lock_read().unlock)
765
786
if revision is not None:
766
787
tree = revision.as_tree(work_tree.branch)
768
789
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
790
self.add_cleanup(tree.lock_read().unlock)
833
854
if len(names_list) < 2:
834
855
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)
856
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
857
self.add_cleanup(tree.lock_tree_write().unlock)
838
858
self._run(tree, names_list, rel_names, after)
840
860
def run_auto(self, names_list, after, dry_run):
845
865
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)
867
work_tree, file_list = WorkingTree.open_containing_paths(
868
names_list, default_directory='.')
869
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
870
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
872
def _run(self, tree, names_list, rel_names, after):
946
966
match the remote one, use pull --overwrite. This will work even if the two
947
967
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.
969
If there is no default location set, the first pull will set it (use
970
--no-remember to avoid settting it). After that, you can omit the
971
location to use the default. To change the default, use --remember. The
972
value will only be saved if the remote location can be accessed.
954
974
Note: The location can be specified either in the form of a branch,
955
975
or in the form of a path to a file containing a merge directive generated
960
980
takes_options = ['remember', 'overwrite', 'revision',
961
981
custom_help('verbose',
962
982
help='Show logs of pulled revisions.'),
983
custom_help('directory',
964
984
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
985
'rather than the one containing the working directory.'),
970
987
help="Perform a local pull in a bound "
971
988
"branch. Local pulls are not applied to "
972
989
"the master branch."
992
help="Show base revision text in conflicts.")
975
994
takes_args = ['location?']
976
995
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
997
def run(self, location=None, remember=None, overwrite=False,
979
998
revision=None, verbose=False,
980
directory=None, local=False):
999
directory=None, local=False,
981
1001
# FIXME: too much stuff is in the command class
982
1002
revision_id = None
983
1003
mergeable = None
987
1007
tree_to = WorkingTree.open_containing(directory)[0]
988
1008
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
1009
self.add_cleanup(tree_to.lock_write().unlock)
991
1010
except errors.NoWorkingTree:
993
1012
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1013
self.add_cleanup(branch_to.lock_write().unlock)
1015
if tree_to is None and show_base:
1016
raise errors.BzrCommandError("Need working tree for --show-base.")
997
1018
if local and not branch_to.get_bound_location():
998
1019
raise errors.LocalRequiresBoundBranch()
1077
1103
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1104
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.
1106
If there is no default push location set, the first push will set it (use
1107
--no-remember to avoid settting it). After that, you can omit the
1108
location to use the default. To change the default, use --remember. The
1109
value will only be saved if the remote location can be accessed.
1086
1112
_see_also = ['pull', 'update', 'working-trees']
1088
1114
Option('create-prefix',
1089
1115
help='Create the path leading up to the branch '
1090
1116
'if it does not already exist.'),
1117
custom_help('directory',
1092
1118
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1119
'rather than the one containing the working directory.'),
1097
1120
Option('use-existing-dir',
1098
1121
help='By default push will fail if the target'
1099
1122
' directory exists, but does not already'
1110
1133
Option('strict',
1111
1134
help='Refuse to push if there are uncommitted changes in'
1112
1135
' the working tree, --no-strict disables the check.'),
1137
help="Don't populate the working tree, even for protocols"
1138
" that support it."),
1114
1140
takes_args = ['location?']
1115
1141
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1143
def run(self, location=None, remember=None, overwrite=False,
1118
1144
create_prefix=False, verbose=False, revision=None,
1119
1145
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1146
stacked=False, strict=None, no_tree=False):
1121
1147
from bzrlib.push import _show_push_branch
1123
1149
if directory is None:
1169
1195
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1196
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1197
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1198
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1201
class cmd_branch(Command):
1185
1211
To retrieve the branch as of a particular revision, supply the --revision
1186
1212
parameter, as in "branch foo/bar -r 5".
1214
The synonyms 'clone' and 'get' for this command are deprecated.
1189
1217
_see_also = ['checkout']
1190
1218
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1219
takes_options = ['revision',
1220
Option('hardlink', help='Hard-link working tree files where possible.'),
1221
Option('files-from', type=str,
1222
help="Get file contents from this tree."),
1193
1223
Option('no-tree',
1194
1224
help="Create a branch without a working-tree."),
1195
1225
Option('switch',
1214
1244
def run(self, from_location, to_location=None, revision=None,
1215
1245
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1246
use_existing_dir=False, switch=False, bind=False,
1217
1248
from bzrlib import switch as _mod_switch
1218
1249
from bzrlib.tag import _merge_tags_if_possible
1250
if self.invoked_as in ['get', 'clone']:
1251
ui.ui_factory.show_user_warning(
1252
'deprecated_command',
1253
deprecated_name=self.invoked_as,
1254
recommended_name='branch',
1255
deprecated_in_version='2.4')
1219
1256
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1258
if not (hardlink or files_from):
1259
# accelerator_tree is usually slower because you have to read N
1260
# files (no readahead, lots of seeks, etc), but allow the user to
1261
# explicitly request it
1262
accelerator_tree = None
1263
if files_from is not None and files_from != from_location:
1264
accelerator_tree = WorkingTree.open(files_from)
1221
1265
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1266
self.add_cleanup(br_from.lock_read().unlock)
1224
1267
if revision is not None:
1225
1268
revision_id = revision.as_revision_id(br_from)
1331
1374
to_location = branch_location
1332
1375
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1376
branch_location)
1377
if not (hardlink or files_from):
1378
# accelerator_tree is usually slower because you have to read N
1379
# files (no readahead, lots of seeks, etc), but allow the user to
1380
# explicitly request it
1381
accelerator_tree = None
1334
1382
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1383
if files_from is not None and files_from != branch_location:
1336
1384
accelerator_tree = WorkingTree.open(files_from)
1337
1385
if revision is not None:
1338
1386
revision_id = revision.as_revision_id(source)
1396
1442
If you want to discard your local changes, you can just do a
1397
1443
'bzr revert' instead of 'bzr commit' after the update.
1445
If you want to restore a file that has been removed locally, use
1446
'bzr revert' instead of 'bzr update'.
1399
1448
If the tree's branch is bound to a master branch, it will also update
1400
1449
the branch from the master.
1403
1452
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1453
takes_args = ['dir?']
1405
takes_options = ['revision']
1454
takes_options = ['revision',
1456
help="Show base revision text in conflicts."),
1406
1458
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1460
def run(self, dir='.', revision=None, show_base=None):
1409
1461
if revision is not None and len(revision) != 1:
1410
1462
raise errors.BzrCommandError(
1411
1463
"bzr update --revision takes exactly one revision")
1519
1572
class cmd_remove(Command):
1520
1573
__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.
1575
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1576
delete them if they can easily be recovered using revert otherwise they
1577
will be backed up (adding an extention of the form .~#~). If no options or
1578
parameters are given Bazaar will scan for files that are being tracked by
1579
Bazaar but missing in your tree and stop tracking them for you.
1527
1581
takes_args = ['file*']
1528
1582
takes_options = ['verbose',
1530
1584
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1585
'The file deletion mode to be used.',
1532
1586
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1587
safe='Backup changed files (default).',
1535
1588
keep='Delete from bzr but leave the working copy.',
1589
no_backup='Don\'t backup changed files.',
1536
1590
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1591
'recovered and even if they are non-empty directories. '
1592
'(deprecated, use no-backup)')]
1538
1593
aliases = ['rm', 'del']
1539
1594
encoding_type = 'replace'
1541
1596
def run(self, file_list, verbose=False, new=False,
1542
1597
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1598
if file_deletion_strategy == 'force':
1599
note("(The --force option is deprecated, rather use --no-backup "
1601
file_deletion_strategy = 'no-backup'
1603
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1605
if file_list is not None:
1546
1606
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1608
self.add_cleanup(tree.lock_write().unlock)
1550
1609
# Heuristics should probably all move into tree.remove_smart or
1636
1695
_see_also = ['check']
1637
1696
takes_args = ['branch?']
1698
Option('canonicalize-chks',
1699
help='Make sure CHKs are in canonical form (repairs '
1639
def run(self, branch="."):
1704
def run(self, branch=".", canonicalize_chks=False):
1640
1705
from bzrlib.reconcile import reconcile
1641
1706
dir = bzrdir.BzrDir.open(branch)
1707
reconcile(dir, canonicalize_chks=canonicalize_chks)
1645
1710
class cmd_revision_history(Command):
1678
1743
last_revision = wt.last_revision()
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
1745
self.add_cleanup(b.repository.lock_read().unlock)
1746
graph = b.repository.get_graph()
1747
revisions = [revid for revid, parents in
1748
graph.iter_ancestry([last_revision])]
1749
for revision_id in reversed(revisions):
1750
if _mod_revision.is_null(revision_id):
1683
1752
self.outf.write(revision_id + '\n')
1723
1792
Option('append-revisions-only',
1724
1793
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1794
' Append revisions to it only.'),
1796
'Create a branch without a working tree.')
1727
1798
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1799
create_prefix=False, no_tree=False):
1729
1800
if format is None:
1730
1801
format = bzrdir.format_registry.make_bzrdir('default')
1731
1802
if location is None:
1985
2079
old_branch, new_branch,
1986
2080
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2081
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2082
# GNU diff on Windows uses ANSI encoding for filenames
2083
path_encoding = osutils.get_diff_header_encoding()
1988
2084
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2085
specific_files=specific_files,
1990
2086
external_diff_options=diff_options,
1991
2087
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2088
extra_trees=extra_trees,
2089
path_encoding=path_encoding,
1993
2091
format_cls=format)
2003
2101
# level of effort but possibly much less IO. (Or possibly not,
2004
2102
# if the directories are very large...)
2005
2103
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2104
takes_options = ['directory', 'show-ids']
2008
2106
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2107
def run(self, show_ids=False, directory=u'.'):
2108
tree = WorkingTree.open_containing(directory)[0]
2109
self.add_cleanup(tree.lock_read().unlock)
2013
2110
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2111
self.add_cleanup(old.lock_read().unlock)
2016
2112
for path, ie in old.inventory.iter_entries():
2017
2113
if not tree.has_id(ie.file_id):
2018
2114
self.outf.write(path)
2030
2126
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2127
takes_options = ['directory', 'null']
2037
2129
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2130
def run(self, null=False, directory=u'.'):
2131
tree = WorkingTree.open_containing(directory)[0]
2132
self.add_cleanup(tree.lock_read().unlock)
2040
2133
td = tree.changes_from(tree.basis_tree())
2041
2135
for path, id, kind, text_modified, meta_modified in td.modified:
2043
2137
self.outf.write(path + '\0')
2053
2147
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2148
takes_options = ['directory', 'null']
2060
2150
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2151
def run(self, null=False, directory=u'.'):
2152
wt = WorkingTree.open_containing(directory)[0]
2153
self.add_cleanup(wt.lock_read().unlock)
2065
2154
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2155
self.add_cleanup(basis.lock_read().unlock)
2068
2156
basis_inv = basis.inventory
2069
2157
inv = wt.inventory
2070
2158
for file_id in inv:
2071
if file_id in basis_inv:
2159
if basis_inv.has_id(file_id):
2073
2161
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2163
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2164
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2167
self.outf.write(path + '\0')
2378
2474
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2475
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2476
self.add_cleanup(b.lock_read().unlock)
2382
2477
rev1, rev2 = _get_revision_range(revision, b, self.name())
2479
if b.get_config().validate_signatures_in_log():
2483
if not gpg.GPGStrategy.verify_signatures_available():
2484
raise errors.GpgmeNotInstalled(None)
2384
2486
# Decide on the type of delta & diff filtering to use
2385
2487
# TODO: add an --all-files option to make this configurable & consistent
2386
2488
if not verbose:
2528
2631
help='Recurse into subdirectories.'),
2529
2632
Option('from-root',
2530
2633
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2634
Option('unknown', short_name='u',
2635
help='Print unknown files.'),
2532
2636
Option('versioned', help='Print versioned files.',
2533
2637
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.'),
2638
Option('ignored', short_name='i',
2639
help='Print ignored files.'),
2640
Option('kind', short_name='k',
2539
2641
help='List entries of a particular kind: file, directory, symlink.',
2543
2647
@display_command
2544
2648
def run(self, revision=None, verbose=False,
2545
2649
recursive=False, from_root=False,
2546
2650
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2651
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2653
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2654
raise errors.BzrCommandError('invalid kind specified')
2713
2826
_see_also = ['status', 'ignored', 'patterns']
2714
2827
takes_args = ['name_pattern*']
2828
takes_options = ['directory',
2716
2829
Option('default-rules',
2717
2830
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2833
def run(self, name_pattern_list=None, default_rules=None,
2721
2835
from bzrlib import ignores
2722
2836
if default_rules is not None:
2723
2837
# dump the default rules and exit
2729
2843
"NAME_PATTERN or --default-rules.")
2730
2844
name_pattern_list = [globbing.normalize_pattern(p)
2731
2845
for p in name_pattern_list]
2847
for p in name_pattern_list:
2848
if not globbing.Globster.is_pattern_valid(p):
2849
bad_patterns += ('\n %s' % p)
2851
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2852
ui.ui_factory.show_error(msg)
2853
raise errors.InvalidPattern('')
2732
2854
for name_pattern in name_pattern_list:
2733
2855
if (name_pattern[0] == '/' or
2734
2856
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2857
raise errors.BzrCommandError(
2736
2858
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2859
tree, relpath = WorkingTree.open_containing(directory)
2738
2860
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2861
ignored = globbing.Globster(name_pattern_list)
2863
self.add_cleanup(tree.lock_read().unlock)
2742
2864
for entry in tree.list_files():
2744
2866
if id is not None:
2745
2867
filename = entry[0]
2746
2868
if ignored.match(filename):
2747
2869
matches.append(filename)
2749
2870
if len(matches) > 0:
2750
2871
self.outf.write("Warning: the following files are version controlled and"
2751
2872
" match your ignore pattern:\n%s"
2767
2888
encoding_type = 'replace'
2768
2889
_see_also = ['ignore', 'ls']
2890
takes_options = ['directory']
2770
2892
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2893
def run(self, directory=u'.'):
2894
tree = WorkingTree.open_containing(directory)[0]
2895
self.add_cleanup(tree.lock_read().unlock)
2775
2896
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2897
if file_class != 'I':
2844
2967
'revision in which it was changed.'),
2846
2969
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2970
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2971
from bzrlib.export import export
2850
2973
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2974
tree = WorkingTree.open_containing(directory)[0]
2852
2975
b = tree.branch
2885
3008
@display_command
2886
3009
def run(self, filename, revision=None, name_from_revision=False,
3010
filters=False, directory=None):
2888
3011
if revision is not None and len(revision) != 1:
2889
3012
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
3013
" one revision specifier")
2891
3014
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3015
_open_directory_or_containing_tree_or_branch(filename, directory)
3016
self.add_cleanup(branch.lock_read().unlock)
2895
3017
return self._run(tree, branch, relpath, filename, revision,
2896
3018
name_from_revision, filters)
2912
3037
"%r is not present in revision %s" % (
2913
3038
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3040
actual_file_id = old_file_id
2917
3042
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
3043
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3044
actual_file_id = cur_file_id
3045
elif old_file_id is not None:
3046
actual_file_id = old_file_id
2933
3048
raise errors.BzrCommandError(
2934
3049
"%r is not present in revision %s" % (
2935
3050
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)
3052
from bzrlib.filter_tree import ContentFilterTree
3053
filter_tree = ContentFilterTree(rev_tree,
3054
rev_tree._content_filter_stack)
3055
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3057
content = rev_tree.get_file_text(actual_file_id)
3059
self.outf.write(content)
2952
3062
class cmd_local_time_offset(Command):
3013
3123
to trigger updates to external systems like bug trackers. The --fixes
3014
3124
option can be used to record the association between a revision and
3015
3125
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
3128
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3129
takes_args = ['selected*']
3101
3190
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3191
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3192
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3194
from bzrlib.errors import (
3105
3195
PointlessCommit,
3106
3196
ConflictsInTree,
3120
3211
raise errors.BzrCommandError(
3121
3212
"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
3214
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3216
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3217
if selected_list == ['']:
3133
3218
# workaround - commit of root of tree should be exactly the same
3134
3219
# as just default commit in that tree, and succeed even though
3184
3272
# make_commit_message_template_encoded returns user encoding.
3185
3273
# 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)
3275
my_message = set_commit_message(commit_obj)
3276
if my_message is None:
3277
start_message = generate_commit_message_template(commit_obj)
3278
my_message = edit_commit_message_encoded(text,
3279
start_message=start_message)
3190
3280
if my_message is None:
3191
3281
raise errors.BzrCommandError("please specify a commit"
3192
3282
" message with either --message or --file")
3205
3295
reporter=None, verbose=verbose, revprops=properties,
3206
3296
authors=author, timestamp=commit_stamp,
3207
3297
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3298
exclude=tree.safe_relpath_files(exclude),
3209
3300
except PointlessCommit:
3210
3301
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3302
" Please 'bzr add' the files you want to commit, or use"
3303
" --unchanged to force an empty commit.")
3212
3304
except ConflictsInTree:
3213
3305
raise errors.BzrCommandError('Conflicts detected in working '
3214
3306
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3297
3389
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.
3390
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3392
When the default format has changed after a major new release of
3393
Bazaar, you may be informed during certain operations that you
3394
should upgrade. Upgrading to a newer format may improve performance
3395
or make new features available. It may however limit interoperability
3396
with older repositories or with older versions of Bazaar.
3398
If you wish to upgrade to a particular format rather than the
3399
current default, that can be specified using the --format option.
3400
As a consequence, you can use the upgrade command this way to
3401
"downgrade" to an earlier format, though some conversions are
3402
a one way process (e.g. changing from the 1.x default to the
3403
2.x default) so downgrading is not always possible.
3405
A backup.bzr.~#~ directory is created at the start of the conversion
3406
process (where # is a number). By default, this is left there on
3407
completion. If the conversion fails, delete the new .bzr directory
3408
and rename this one back in its place. Use the --clean option to ask
3409
for the backup.bzr directory to be removed on successful conversion.
3410
Alternatively, you can delete it by hand if everything looks good
3413
If the location given is a shared repository, dependent branches
3414
are also converted provided the repository converts successfully.
3415
If the conversion of a branch fails, remaining branches are still
3418
For more information on upgrades, see the Bazaar Upgrade Guide,
3419
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3422
_see_also = ['check', 'reconcile', 'formats']
3306
3423
takes_args = ['url?']
3307
3424
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'),
3425
RegistryOption('format',
3426
help='Upgrade to a specific format. See "bzr help'
3427
' formats" for details.',
3428
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3429
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3430
value_switches=True, title='Branch format'),
3432
help='Remove the backup.bzr directory if successful.'),
3434
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3437
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3438
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3439
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3441
if len(exceptions) == 1:
3442
# Compatibility with historical behavior
3321
3448
class cmd_whoami(Command):
3340
3468
encoding_type = 'replace'
3342
3470
@display_command
3343
def run(self, email=False, branch=False, name=None):
3471
def run(self, email=False, branch=False, name=None, directory=None):
3344
3472
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()
3473
if directory is None:
3474
# use branch if we're inside one; otherwise global config
3476
c = Branch.open_containing(u'.')[0].get_config()
3477
except errors.NotBranchError:
3478
c = _mod_config.GlobalConfig()
3480
c = Branch.open(directory).get_config()
3351
3482
self.outf.write(c.user_email() + '\n')
3353
3484
self.outf.write(c.username() + '\n')
3488
raise errors.BzrCommandError("--email can only be used to display existing "
3356
3491
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3493
_mod_config.extract_email_address(name)
3359
3494
except errors.NoEmailInUsername, e:
3360
3495
warning('"%s" does not seem to contain an email address. '
3361
3496
'This is allowed, but not recommended.', name)
3363
3498
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3500
if directory is None:
3501
c = Branch.open_containing(u'.')[0].get_config()
3503
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3505
c = _mod_config.GlobalConfig()
3368
3506
c.set_user_option('email', name)
3436
3575
'bzr alias --remove expects an alias to remove.')
3437
3576
# If alias is not found, print something like:
3438
3577
# unalias: foo: not found
3439
c = config.GlobalConfig()
3578
c = _mod_config.GlobalConfig()
3440
3579
c.unset_alias(alias_name)
3442
3581
@display_command
3443
3582
def print_aliases(self):
3444
3583
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3584
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3585
for key, value in sorted(aliases.iteritems()):
3447
3586
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3515
3657
if typestring == "sftp":
3516
3658
from bzrlib.tests import stub_sftp
3517
3659
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3660
elif typestring == "memory":
3519
3661
from bzrlib.tests import test_server
3520
3662
return memory.MemoryServer
3521
if typestring == "fakenfs":
3663
elif typestring == "fakenfs":
3522
3664
from bzrlib.tests import test_server
3523
3665
return test_server.FakeNFSServer
3524
3666
msg = "No known transport type %s. Supported types are: sftp\n" %\
3537
3679
'throughout the test suite.',
3538
3680
type=get_transport_type),
3539
3681
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3682
help='Run the benchmarks rather than selftests.',
3541
3684
Option('lsprof-timed',
3542
3685
help='Generate lsprof output for benchmarked'
3543
3686
' sections of code.'),
3544
3687
Option('lsprof-tests',
3545
3688
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3689
Option('first',
3550
3690
help='Run all tests, but run specified tests first.',
3551
3691
short_name='f',
3560
3700
Option('randomize', type=str, argname="SEED",
3561
3701
help='Randomize the order of tests using the given'
3562
3702
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3703
ListOption('exclude', type=str, argname="PATTERN",
3705
help='Exclude tests that match this regular'
3567
3707
Option('subunit',
3568
3708
help='Output test progress via subunit.'),
3569
3709
Option('strict', help='Fail on missing dependencies or '
3586
3726
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3727
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3729
first=False, list_only=False,
3590
3730
randomize=None, exclude=None, strict=False,
3591
3731
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
3732
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)
3733
from bzrlib import tests
3602
3735
if testspecs_list is not None:
3603
3736
pattern = '|'.join(testspecs_list)
3612
3745
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3746
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3747
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3748
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3749
# following code can be deleted when it's sufficiently deployed
3750
# -- vila/mgz 20100514
3751
if (sys.platform == "win32"
3752
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3754
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3756
self.additional_selftest_args.setdefault(
3620
3757
'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)
3759
raise errors.BzrCommandError(
3760
"--benchmark is no longer supported from bzr 2.2; "
3761
"use bzr-usertest instead")
3762
test_suite_factory = None
3764
exclude_pattern = None
3629
test_suite_factory = None
3766
exclude_pattern = '(' + '|'.join(exclude) + ')'
3631
3767
selftest_kwargs = {"verbose": verbose,
3632
3768
"pattern": pattern,
3633
3769
"stop_on_failure": one,
3635
3771
"test_suite_factory": test_suite_factory,
3636
3772
"lsprof_timed": lsprof_timed,
3637
3773
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3774
"matching_tests_first": first,
3640
3775
"list_only": list_only,
3641
3776
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3777
"exclude_pattern": exclude_pattern,
3643
3778
"strict": strict,
3644
3779
"load_list": load_list,
3645
3780
"debug_flags": debugflag,
3646
3781
"starting_with": starting_with
3648
3783
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3785
# Make deprecation warnings visible, unless -Werror is set
3786
cleanup = symbol_versioning.activate_deprecation_warnings(
3789
result = tests.selftest(**selftest_kwargs)
3650
3792
return int(not result)
3709
3849
The source of the merge can be specified either in the form of a branch,
3710
3850
or in the form of a path to a file containing a merge directive generated
3711
3851
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.
3852
or the branch most recently merged using --remember. The source of the
3853
merge may also be specified in the form of a path to a file in another
3854
branch: in this case, only the modifications to that file are merged into
3855
the current working tree.
3857
When merging from a branch, by default bzr will try to merge in all new
3858
work from the other branch, automatically determining an appropriate base
3859
revision. If this fails, you may need to give an explicit base.
3861
To pick a different ending revision, pass "--revision OTHER". bzr will
3862
try to merge in all new work up to and including revision OTHER.
3864
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3865
through OTHER, excluding BASE but including OTHER, will be merged. If this
3866
causes some revisions to be skipped, i.e. if the destination branch does
3867
not already contain revision BASE, such a merge is commonly referred to as
3868
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3869
cherrypicks. The changes look like a normal commit, and the history of the
3870
changes from the other branch is not stored in the commit.
3872
Revision numbers are always relative to the source branch.
3725
3874
Merge will do its best to combine the changes in two branches, but there
3726
3875
are some kinds of problems only a human can fix. When it encounters those,
3730
3879
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.
3881
If there is no default branch set, the first merge will set it (use
3882
--no-remember to avoid settting it). After that, you can omit the branch
3883
to use the default. To change the default, use --remember. The value will
3884
only be saved if the remote location can be accessed.
3737
3886
The results of the merge are placed into the destination working
3738
3887
directory, where they can be reviewed (with bzr diff), tested, and then
3739
3888
committed to record the result of the merge.
3741
3890
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
3891
--force is given. If --force is given, then the changes from the source
3892
will be merged with the current working tree, including any uncommitted
3893
changes in the tree. The --force option can also be used to create a
3743
3894
merge revision which has more than two parents.
3745
3896
If one would like to merge changes from the working tree of the other
3793
3944
' completely merged into the source, pull from the'
3794
3945
' source rather than merging. When this happens,'
3795
3946
' you do not need to commit the result.'),
3947
custom_help('directory',
3797
3948
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3949
'rather than the one containing the working directory.'),
3802
3950
Option('preview', help='Instead of merging, show a diff of the'
3804
3952
Option('interactive', help='Select changes interactively.',
3808
3956
def run(self, location=None, revision=None, force=False,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
3957
merge_type=None, show_base=False, reprocess=None, remember=None,
3810
3958
uncommitted=False, pull=False,
3811
3959
directory=None,
3873
4024
self.sanity_check_merger(merger)
3874
4025
if (merger.base_rev_id == merger.other_rev_id and
3875
4026
merger.other_rev_id is not None):
4027
# check if location is a nonexistent file (and not a branch) to
4028
# disambiguate the 'Nothing to do'
4029
if merger.interesting_files:
4030
if not merger.other_tree.has_filename(
4031
merger.interesting_files[0]):
4032
note("merger: " + str(merger))
4033
raise errors.PathsDoNotExist([location])
3876
4034
note('Nothing to do.')
4036
if pull and not preview:
3879
4037
if merger.interesting_files is not None:
3880
4038
raise errors.BzrCommandError('Cannot pull individual files')
3881
4039
if (merger.base_rev_id == tree.last_revision()):
3905
4063
def _do_preview(self, merger):
3906
4064
from bzrlib.diff import show_diff_trees
3907
4065
result_tree = self._get_preview(merger)
4066
path_encoding = osutils.get_diff_header_encoding()
3908
4067
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
4068
old_label='', new_label='',
4069
path_encoding=path_encoding)
3911
4071
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
4072
merger.change_reporter = change_reporter
3988
4148
if other_revision_id is None:
3989
4149
other_revision_id = _mod_revision.ensure_null(
3990
4150
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):
4151
# Remember where we merge from. We need to remember if:
4152
# - user specify a location (and we don't merge from the parent
4154
# - user ask to remember or there is no previous location set to merge
4155
# from and user didn't ask to *not* remember
4156
if (user_location is not None
4158
or (remember is None
4159
and tree.branch.get_submit_branch() is None)))):
3994
4160
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4161
# Merge tags (but don't set them in the master branch yet, the user
4162
# might revert this merge). Commit will propagate them.
4163
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4164
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4165
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4166
if other_path != '':
4167
4334
last committed revision is used.
4169
4336
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.
4337
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4338
will remove the changes introduced by the second last commit (-2), without
4339
affecting the changes introduced by the last commit (-1). To remove
4340
certain changes on a hunk-by-hunk basis, see the shelve command.
4174
4342
By default, any files that have been manually changed will be backed up
4175
4343
first. (Files changed only by merge are not backed up.) Backup files have
4340
4508
theirs_only=False,
4341
4509
log_format=None, long=False, short=False, line=False,
4342
4510
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4511
include_merges=False, revision=None, my_revision=None,
4344
4513
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4514
def message(s):
4346
4515
if not is_quiet():
4507
4673
@display_command
4508
4674
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")
4675
from bzrlib import plugin
4676
# Don't give writelines a generator as some codecs don't like that
4677
self.outf.writelines(
4678
list(plugin.describe_plugins(show_paths=verbose)))
4531
4681
class cmd_testament(Command):
4578
4727
Option('long', help='Show commit date in annotations.'),
4582
4732
encoding_type = 'exact'
4584
4734
@display_command
4585
4735
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4736
show_ids=False, directory=None):
4737
from bzrlib.annotate import (
4588
4740
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4741
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4742
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4743
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4745
self.add_cleanup(branch.lock_read().unlock)
4596
4746
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4747
self.add_cleanup(tree.lock_read().unlock)
4748
if wt is not None and revision is None:
4600
4749
file_id = wt.path2id(relpath)
4602
4751
file_id = tree.path2id(relpath)
4603
4752
if file_id is None:
4604
4753
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4754
if wt is not None and revision is None:
4607
4755
# If there is a tree and we're not annotating historical
4608
4756
# versions, annotate the working tree's content.
4609
4757
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4758
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4760
annotate_file_tree(tree, file_id, self.outf, long, all,
4761
show_ids=show_ids, branch=branch)
4616
4764
class cmd_re_sign(Command):
4620
4768
hidden = True # is this right ?
4621
4769
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4770
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4772
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4773
if revision_id_list is not None and revision is not None:
4626
4774
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4775
if revision_id_list is None and revision is None:
4628
4776
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)
4777
b = WorkingTree.open_containing(directory)[0].branch
4778
self.add_cleanup(b.lock_write().unlock)
4632
4779
return self._run(b, revision_id_list, revision)
4634
4781
def _run(self, b, revision_id_list, revision):
4694
4841
_see_also = ['checkouts', 'unbind']
4695
4842
takes_args = ['location?']
4843
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4845
def run(self, location=None, directory=u'.'):
4846
b, relpath = Branch.open_containing(directory)
4700
4847
if location is None:
4702
4849
location = b.get_old_bound_location()
4784
4931
b = control.open_branch()
4786
4933
if tree is not None:
4788
self.add_cleanup(tree.unlock)
4934
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4936
self.add_cleanup(b.lock_write().unlock)
4792
4937
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4794
4939
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4859
5010
bzr break-lock bzr+ssh://example.com/bzr/foo
5011
bzr break-lock --conf ~/.bazaar
4861
5014
takes_args = ['location?']
5017
help='LOCATION is the directory where the config lock is.'),
5019
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5022
def run(self, location=None, config=False, force=False):
4864
5023
if location is None:
4865
5024
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5026
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5028
{'bzrlib.lockdir.break': True})
5030
conf = _mod_config.LockableConfig(file_name=location)
5033
control, relpath = bzrdir.BzrDir.open_containing(location)
5035
control.break_lock()
5036
except NotImplementedError:
4873
5040
class cmd_wait_until_signalled(Command):
4938
5104
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
5105
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
5106
from bzrlib import transport
4941
5107
if directory is None:
4942
5108
directory = os.getcwd()
4943
5109
if protocol is None:
4944
protocol = transport_server_registry.get()
5110
protocol = transport.transport_server_registry.get()
4945
5111
host, port = self.get_host_and_port(port)
4946
5112
url = urlutils.local_path_to_url(directory)
4947
5113
if not allow_writes:
4948
5114
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5115
t = transport.get_transport(url)
5116
protocol(t, host, port, inet)
4953
5119
class cmd_join(Command):
5064
5231
encoding_type = 'exact'
5066
5233
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5234
sign=False, revision=None, mail_to=None, message=None,
5068
5236
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5237
include_patch, include_bundle = {
5070
5238
'plain': (False, False),
5071
5239
'diff': (True, False),
5072
5240
'bundle': (True, True),
5074
branch = Branch.open('.')
5242
branch = Branch.open(directory)
5075
5243
stored_submit_branch = branch.get_submit_branch()
5076
5244
if submit_branch is None:
5077
5245
submit_branch = stored_submit_branch
5153
5321
source branch defaults to that containing the working directory, but can
5154
5322
be changed using --from.
5324
Both the submit branch and the public branch follow the usual behavior with
5325
respect to --remember: If there is no default location set, the first send
5326
will set it (use --no-remember to avoid settting it). After that, you can
5327
omit the location to use the default. To change the default, use
5328
--remember. The value will only be saved if the location can be accessed.
5156
5330
In order to calculate those changes, bzr must analyse the submit branch.
5157
5331
Therefore it is most efficient for the submit branch to be a local mirror.
5158
5332
If a public location is known for the submit_branch, that location is used
5229
5403
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5404
no_patch=False, revision=None, remember=None, output=None,
5231
5405
format=None, mail_to=None, message=None, body=None,
5232
5406
strict=None, **kwargs):
5233
5407
from bzrlib.send import send
5393
5563
_see_also = ['tag']
5394
5564
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5565
custom_help('directory',
5566
help='Branch whose tags should be displayed.'),
5567
RegistryOption('sort',
5401
5568
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5569
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5575
@display_command
5576
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5577
from bzrlib.tag import tag_sort_methods
5416
5578
branch, relpath = Branch.open_containing(directory)
5418
5580
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5584
self.add_cleanup(branch.lock_read().unlock)
5425
5586
graph = branch.repository.get_graph()
5426
5587
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5428
5589
# only show revisions between revid1 and revid2 (inclusive)
5429
5590
tags = [(tag, revid) for tag, revid in tags if
5430
5591
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]])
5593
sort = tag_sort_methods.get()
5444
5595
if not show_ids:
5445
5596
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5597
for index, (tag, revid) in enumerate(tags):
5584
5736
def run(self, to_location=None, force=False, create_branch=False,
5737
revision=None, directory=u'.'):
5586
5738
from bzrlib import switch
5739
tree_location = directory
5588
5740
revision = _get_one_revision('switch', revision)
5589
5741
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5742
if to_location is None:
5591
5743
if revision is None:
5592
5744
raise errors.BzrCommandError('You must supply either a'
5593
5745
' revision or a location')
5746
to_location = tree_location
5596
5748
branch = control_dir.open_branch()
5597
5749
had_explicit_nick = branch.get_config().has_explicit_nickname()
5868
6021
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6022
restore the most recently shelved changes.
6024
For complicated changes, it is possible to edit the changes in a separate
6025
editor program to decide what the file remaining in the working copy
6026
should look like. To do this, add the configuration option
6028
change_editor = PROGRAM @new_path @old_path
6030
where @new_path is replaced with the path of the new version of the
6031
file and @old_path is replaced with the path of the old version of
6032
the file. The PROGRAM should save the new file with the desired
6033
contents of the file in the working tree.
5872
6037
takes_args = ['file*']
5874
6039
takes_options = [
5876
6042
Option('all', help='Shelve all changes.'),
5883
6049
Option('destroy',
5884
6050
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6052
_see_also = ['unshelve', 'configuration']
5888
6054
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6055
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6057
return self.run_for_list(directory=directory)
5892
6058
from bzrlib.shelf_ui import Shelver
5893
6059
if writer is None:
5894
6060
writer = bzrlib.option.diff_writer_registry.get()
5896
6062
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6063
file_list, message, destroy=destroy, directory=directory)
5967
6135
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'
6137
takes_options = ['directory',
6138
Option('ignored', help='Delete all ignored files.'),
6139
Option('detritus', help='Delete conflict files, merge and revert'
5971
6140
' backups, and failed selftest dirs.'),
5972
6141
Option('unknown',
5973
6142
help='Delete files unknown to bzr (default).'),
5975
6144
' deleting them.'),
5976
6145
Option('force', help='Do not prompt before deleting.')]
5977
6146
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6147
force=False, directory=u'.'):
5979
6148
from bzrlib.clean_tree import clean_tree
5980
6149
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6153
clean_tree(directory, unknown=unknown, ignored=ignored,
6154
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6157
class cmd_reference(Command):
6032
6201
self.outf.write('%s %s\n' % (path, location))
6204
class cmd_export_pot(Command):
6205
__doc__ = """Export command helps and error messages in po format."""
6210
from bzrlib.export_pot import export_pot
6211
export_pot(self.outf)
6035
6214
def _register_lazy_builtins():
6036
6215
# register lazy builtins from other modules; called at startup and should
6037
6216
# be only called once.
6038
6217
for (name, aliases, module_name) in [
6039
6218
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6219
('cmd_config', [], 'bzrlib.config'),
6040
6220
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6221
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6222
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6223
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6224
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6225
('cmd_verify_signatures', [],
6226
'bzrlib.commit_signature_commands'),
6227
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6229
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
