73
71
_parse_revision_str,
75
73
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
79
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
80
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]))
82
return internal_tree_files(file_list, default_branch, canonicalize,
88
86
def tree_files_for_add(file_list):
153
151
# XXX: Bad function name; should possibly also be a class method of
154
152
# WorkingTree rather than a function.
153
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
154
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
155
apply_view=True):
157
156
"""Convert command-line paths to a WorkingTree and relative paths.
158
Deprecated: use WorkingTree.open_containing_paths instead.
159
160
This is typically used for command-line processors that take one or
160
161
more filenames, and infer the workingtree that contains them.
172
173
: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)
175
return WorkingTree.open_containing_paths(
176
file_list, default_directory='.',
223
181
def _get_view_info_for_change_reporter(tree):
193
def _open_directory_or_containing_tree_or_branch(filename, directory):
194
"""Open the tree or branch containing the specified file, unless
195
the --directory option is used to specify a different branch."""
196
if directory is not None:
197
return (None, Branch.open(directory), filename)
198
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
201
# TODO: Make sure no commands unconditionally use the working directory as a
236
202
# branch. If a filename argument is used, the first of them should be used to
237
203
# specify the branch. (Perhaps this can be factored out into some kind of
286
252
To skip the display of pending merge information altogether, use
287
253
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.
255
To compare the working directory to a specific revision, pass a
256
single revision to the revision argument.
258
To see which files have changed in a specific revision, or between
259
two revisions, pass a revision range to the revision argument.
260
This will produce the same results as calling 'bzr diff --summarize'.
293
263
# TODO: --no-recurse, --recurse options
353
323
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
326
def run(self, revision_id=None, revision=None, directory=u'.'):
357
327
if revision_id is not None and revision is not None:
358
328
raise errors.BzrCommandError('You can only supply one of'
359
329
' revision_id or --revision')
360
330
if revision_id is None and revision is None:
361
331
raise errors.BzrCommandError('You must supply either'
362
332
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
334
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
365
336
revisions = b.repository.revisions
366
337
if revisions is None:
511
487
d.destroy_workingtree()
490
class cmd_repair_workingtree(Command):
491
__doc__ = """Reset the working tree state file.
493
This is not meant to be used normally, but more as a way to recover from
494
filesystem corruption, etc. This rebuilds the working inventory back to a
495
'known good' state. Any new modifications (adding a file, renaming, etc)
496
will be lost, though modified files will still be detected as such.
498
Most users will want something more like "bzr revert" or "bzr update"
499
unless the state file has become corrupted.
501
By default this attempts to recover the current state by looking at the
502
headers of the state file. If the state file is too corrupted to even do
503
that, you can supply --revision to force the state of the tree.
506
takes_options = ['revision', 'directory',
508
help='Reset the tree even if it doesn\'t appear to be'
513
def run(self, revision=None, directory='.', force=False):
514
tree, _ = WorkingTree.open_containing(directory)
515
self.add_cleanup(tree.lock_tree_write().unlock)
519
except errors.BzrError:
520
pass # There seems to be a real error here, so we'll reset
523
raise errors.BzrCommandError(
524
'The tree does not appear to be corrupt. You probably'
525
' want "bzr revert" instead. Use "--force" if you are'
526
' sure you want to reset the working tree.')
530
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
532
tree.reset_state(revision_ids)
533
except errors.BzrError, e:
534
if revision_ids is None:
535
extra = (', the header appears corrupt, try passing -r -1'
536
' to set the state to the last commit')
539
raise errors.BzrCommandError('failed to reset the tree state'
514
543
class cmd_revno(Command):
515
544
__doc__ = """Show current revision number.
759
780
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
761
782
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)
783
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
784
self.add_cleanup(work_tree.lock_read().unlock)
765
785
if revision is not None:
766
786
tree = revision.as_tree(work_tree.branch)
768
788
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
789
self.add_cleanup(tree.lock_read().unlock)
833
853
if len(names_list) < 2:
834
854
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)
855
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
856
self.add_cleanup(tree.lock_tree_write().unlock)
838
857
self._run(tree, names_list, rel_names, after)
840
859
def run_auto(self, names_list, after, dry_run):
845
864
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)
866
work_tree, file_list = WorkingTree.open_containing_paths(
867
names_list, default_directory='.')
868
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
869
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
871
def _run(self, tree, names_list, rel_names, after):
946
965
match the remote one, use pull --overwrite. This will work even if the two
947
966
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.
968
If there is no default location set, the first pull will set it (use
969
--no-remember to avoid settting it). After that, you can omit the
970
location to use the default. To change the default, use --remember. The
971
value will only be saved if the remote location can be accessed.
954
973
Note: The location can be specified either in the form of a branch,
955
974
or in the form of a path to a file containing a merge directive generated
960
979
takes_options = ['remember', 'overwrite', 'revision',
961
980
custom_help('verbose',
962
981
help='Show logs of pulled revisions.'),
982
custom_help('directory',
964
983
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
984
'rather than the one containing the working directory.'),
970
986
help="Perform a local pull in a bound "
971
987
"branch. Local pulls are not applied to "
972
988
"the master branch."
991
help="Show base revision text in conflicts.")
975
993
takes_args = ['location?']
976
994
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
996
def run(self, location=None, remember=None, overwrite=False,
979
997
revision=None, verbose=False,
980
directory=None, local=False):
998
directory=None, local=False,
981
1000
# FIXME: too much stuff is in the command class
982
1001
revision_id = None
983
1002
mergeable = None
987
1006
tree_to = WorkingTree.open_containing(directory)[0]
988
1007
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
1008
self.add_cleanup(tree_to.lock_write().unlock)
991
1009
except errors.NoWorkingTree:
993
1011
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1012
self.add_cleanup(branch_to.lock_write().unlock)
1014
if tree_to is None and show_base:
1015
raise errors.BzrCommandError("Need working tree for --show-base.")
997
1017
if local and not branch_to.get_bound_location():
998
1018
raise errors.LocalRequiresBoundBranch()
1077
1102
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1103
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.
1105
If there is no default push location set, the first push will set it (use
1106
--no-remember to avoid settting it). After that, you can omit the
1107
location to use the default. To change the default, use --remember. The
1108
value will only be saved if the remote location can be accessed.
1086
1111
_see_also = ['pull', 'update', 'working-trees']
1088
1113
Option('create-prefix',
1089
1114
help='Create the path leading up to the branch '
1090
1115
'if it does not already exist.'),
1116
custom_help('directory',
1092
1117
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1118
'rather than the one containing the working directory.'),
1097
1119
Option('use-existing-dir',
1098
1120
help='By default push will fail if the target'
1099
1121
' directory exists, but does not already'
1110
1132
Option('strict',
1111
1133
help='Refuse to push if there are uncommitted changes in'
1112
1134
' the working tree, --no-strict disables the check.'),
1136
help="Don't populate the working tree, even for protocols"
1137
" that support it."),
1114
1139
takes_args = ['location?']
1115
1140
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1142
def run(self, location=None, remember=None, overwrite=False,
1118
1143
create_prefix=False, verbose=False, revision=None,
1119
1144
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1145
stacked=False, strict=None, no_tree=False):
1121
1146
from bzrlib.push import _show_push_branch
1123
1148
if directory is None:
1169
1194
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1195
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1196
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1197
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1200
class cmd_branch(Command):
1185
1210
To retrieve the branch as of a particular revision, supply the --revision
1186
1211
parameter, as in "branch foo/bar -r 5".
1213
The synonyms 'clone' and 'get' for this command are deprecated.
1189
1216
_see_also = ['checkout']
1190
1217
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1218
takes_options = ['revision',
1219
Option('hardlink', help='Hard-link working tree files where possible.'),
1220
Option('files-from', type=str,
1221
help="Get file contents from this tree."),
1193
1222
Option('no-tree',
1194
1223
help="Create a branch without a working-tree."),
1195
1224
Option('switch',
1214
1243
def run(self, from_location, to_location=None, revision=None,
1215
1244
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1245
use_existing_dir=False, switch=False, bind=False,
1217
1247
from bzrlib import switch as _mod_switch
1218
1248
from bzrlib.tag import _merge_tags_if_possible
1249
if self.invoked_as in ['get', 'clone']:
1250
ui.ui_factory.show_user_warning(
1251
'deprecated_command',
1252
deprecated_name=self.invoked_as,
1253
recommended_name='branch',
1254
deprecated_in_version='2.4')
1219
1255
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1257
if not (hardlink or files_from):
1258
# accelerator_tree is usually slower because you have to read N
1259
# files (no readahead, lots of seeks, etc), but allow the user to
1260
# explicitly request it
1261
accelerator_tree = None
1262
if files_from is not None and files_from != from_location:
1263
accelerator_tree = WorkingTree.open(files_from)
1221
1264
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1265
self.add_cleanup(br_from.lock_read().unlock)
1224
1266
if revision is not None:
1225
1267
revision_id = revision.as_revision_id(br_from)
1331
1373
to_location = branch_location
1332
1374
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1375
branch_location)
1376
if not (hardlink or files_from):
1377
# accelerator_tree is usually slower because you have to read N
1378
# files (no readahead, lots of seeks, etc), but allow the user to
1379
# explicitly request it
1380
accelerator_tree = None
1334
1381
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1382
if files_from is not None and files_from != branch_location:
1336
1383
accelerator_tree = WorkingTree.open(files_from)
1337
1384
if revision is not None:
1338
1385
revision_id = revision.as_revision_id(source)
1396
1441
If you want to discard your local changes, you can just do a
1397
1442
'bzr revert' instead of 'bzr commit' after the update.
1444
If you want to restore a file that has been removed locally, use
1445
'bzr revert' instead of 'bzr update'.
1399
1447
If the tree's branch is bound to a master branch, it will also update
1400
1448
the branch from the master.
1403
1451
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1452
takes_args = ['dir?']
1405
takes_options = ['revision']
1453
takes_options = ['revision',
1455
help="Show base revision text in conflicts."),
1406
1457
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1459
def run(self, dir='.', revision=None, show_base=None):
1409
1460
if revision is not None and len(revision) != 1:
1410
1461
raise errors.BzrCommandError(
1411
1462
"bzr update --revision takes exactly one revision")
1519
1571
class cmd_remove(Command):
1520
1572
__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.
1574
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1575
delete them if they can easily be recovered using revert otherwise they
1576
will be backed up (adding an extention of the form .~#~). If no options or
1577
parameters are given Bazaar will scan for files that are being tracked by
1578
Bazaar but missing in your tree and stop tracking them for you.
1527
1580
takes_args = ['file*']
1528
1581
takes_options = ['verbose',
1530
1583
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1584
'The file deletion mode to be used.',
1532
1585
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1586
safe='Backup changed files (default).',
1535
1587
keep='Delete from bzr but leave the working copy.',
1588
no_backup='Don\'t backup changed files.',
1536
1589
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1590
'recovered and even if they are non-empty directories. '
1591
'(deprecated, use no-backup)')]
1538
1592
aliases = ['rm', 'del']
1539
1593
encoding_type = 'replace'
1541
1595
def run(self, file_list, verbose=False, new=False,
1542
1596
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1597
if file_deletion_strategy == 'force':
1598
note("(The --force option is deprecated, rather use --no-backup "
1600
file_deletion_strategy = 'no-backup'
1602
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1604
if file_list is not None:
1546
1605
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1607
self.add_cleanup(tree.lock_write().unlock)
1550
1608
# Heuristics should probably all move into tree.remove_smart or
1636
1694
_see_also = ['check']
1637
1695
takes_args = ['branch?']
1697
Option('canonicalize-chks',
1698
help='Make sure CHKs are in canonical form (repairs '
1639
def run(self, branch="."):
1703
def run(self, branch=".", canonicalize_chks=False):
1640
1704
from bzrlib.reconcile import reconcile
1641
1705
dir = bzrdir.BzrDir.open(branch)
1706
reconcile(dir, canonicalize_chks=canonicalize_chks)
1645
1709
class cmd_revision_history(Command):
1723
1787
Option('append-revisions-only',
1724
1788
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1789
' Append revisions to it only.'),
1791
'Create a branch without a working tree.')
1727
1793
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1794
create_prefix=False, no_tree=False):
1729
1795
if format is None:
1730
1796
format = bzrdir.format_registry.make_bzrdir('default')
1731
1797
if location is None:
1985
2074
old_branch, new_branch,
1986
2075
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2076
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2077
# GNU diff on Windows uses ANSI encoding for filenames
2078
path_encoding = osutils.get_diff_header_encoding()
1988
2079
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2080
specific_files=specific_files,
1990
2081
external_diff_options=diff_options,
1991
2082
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2083
extra_trees=extra_trees,
2084
path_encoding=path_encoding,
1993
2086
format_cls=format)
2003
2096
# level of effort but possibly much less IO. (Or possibly not,
2004
2097
# if the directories are very large...)
2005
2098
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2099
takes_options = ['directory', 'show-ids']
2008
2101
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2102
def run(self, show_ids=False, directory=u'.'):
2103
tree = WorkingTree.open_containing(directory)[0]
2104
self.add_cleanup(tree.lock_read().unlock)
2013
2105
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2106
self.add_cleanup(old.lock_read().unlock)
2016
2107
for path, ie in old.inventory.iter_entries():
2017
2108
if not tree.has_id(ie.file_id):
2018
2109
self.outf.write(path)
2030
2121
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2122
takes_options = ['directory', 'null']
2037
2124
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2125
def run(self, null=False, directory=u'.'):
2126
tree = WorkingTree.open_containing(directory)[0]
2127
self.add_cleanup(tree.lock_read().unlock)
2040
2128
td = tree.changes_from(tree.basis_tree())
2041
2130
for path, id, kind, text_modified, meta_modified in td.modified:
2043
2132
self.outf.write(path + '\0')
2053
2142
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2143
takes_options = ['directory', 'null']
2060
2145
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2146
def run(self, null=False, directory=u'.'):
2147
wt = WorkingTree.open_containing(directory)[0]
2148
self.add_cleanup(wt.lock_read().unlock)
2065
2149
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2150
self.add_cleanup(basis.lock_read().unlock)
2068
2151
basis_inv = basis.inventory
2069
2152
inv = wt.inventory
2070
2153
for file_id in inv:
2071
if file_id in basis_inv:
2154
if basis_inv.has_id(file_id):
2073
2156
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2158
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2159
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2162
self.outf.write(path + '\0')
2528
2615
help='Recurse into subdirectories.'),
2529
2616
Option('from-root',
2530
2617
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2618
Option('unknown', short_name='u',
2619
help='Print unknown files.'),
2532
2620
Option('versioned', help='Print versioned files.',
2533
2621
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.'),
2622
Option('ignored', short_name='i',
2623
help='Print ignored files.'),
2624
Option('kind', short_name='k',
2539
2625
help='List entries of a particular kind: file, directory, symlink.',
2543
2631
@display_command
2544
2632
def run(self, revision=None, verbose=False,
2545
2633
recursive=False, from_root=False,
2546
2634
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2635
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2637
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2638
raise errors.BzrCommandError('invalid kind specified')
2713
2810
_see_also = ['status', 'ignored', 'patterns']
2714
2811
takes_args = ['name_pattern*']
2812
takes_options = ['directory',
2716
2813
Option('default-rules',
2717
2814
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2817
def run(self, name_pattern_list=None, default_rules=None,
2721
2819
from bzrlib import ignores
2722
2820
if default_rules is not None:
2723
2821
# dump the default rules and exit
2729
2827
"NAME_PATTERN or --default-rules.")
2730
2828
name_pattern_list = [globbing.normalize_pattern(p)
2731
2829
for p in name_pattern_list]
2831
for p in name_pattern_list:
2832
if not globbing.Globster.is_pattern_valid(p):
2833
bad_patterns += ('\n %s' % p)
2835
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2836
ui.ui_factory.show_error(msg)
2837
raise errors.InvalidPattern('')
2732
2838
for name_pattern in name_pattern_list:
2733
2839
if (name_pattern[0] == '/' or
2734
2840
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2841
raise errors.BzrCommandError(
2736
2842
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2843
tree, relpath = WorkingTree.open_containing(directory)
2738
2844
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2845
ignored = globbing.Globster(name_pattern_list)
2847
self.add_cleanup(tree.lock_read().unlock)
2742
2848
for entry in tree.list_files():
2744
2850
if id is not None:
2745
2851
filename = entry[0]
2746
2852
if ignored.match(filename):
2747
2853
matches.append(filename)
2749
2854
if len(matches) > 0:
2750
2855
self.outf.write("Warning: the following files are version controlled and"
2751
2856
" match your ignore pattern:\n%s"
2767
2872
encoding_type = 'replace'
2768
2873
_see_also = ['ignore', 'ls']
2874
takes_options = ['directory']
2770
2876
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2877
def run(self, directory=u'.'):
2878
tree = WorkingTree.open_containing(directory)[0]
2879
self.add_cleanup(tree.lock_read().unlock)
2775
2880
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2881
if file_class != 'I':
2844
2951
'revision in which it was changed.'),
2846
2953
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2954
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2955
from bzrlib.export import export
2850
2957
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2958
tree = WorkingTree.open_containing(directory)[0]
2852
2959
b = tree.branch
2885
2992
@display_command
2886
2993
def run(self, filename, revision=None, name_from_revision=False,
2994
filters=False, directory=None):
2888
2995
if revision is not None and len(revision) != 1:
2889
2996
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2997
" one revision specifier")
2891
2998
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2999
_open_directory_or_containing_tree_or_branch(filename, directory)
3000
self.add_cleanup(branch.lock_read().unlock)
2895
3001
return self._run(tree, branch, relpath, filename, revision,
2896
3002
name_from_revision, filters)
3013
3118
to trigger updates to external systems like bug trackers. The --fixes
3014
3119
option can be used to record the association between a revision and
3015
3120
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
3123
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3124
takes_args = ['selected*']
3101
3185
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3186
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3187
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3189
from bzrlib.errors import (
3105
3190
PointlessCommit,
3106
3191
ConflictsInTree,
3120
3206
raise errors.BzrCommandError(
3121
3207
"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
3209
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3211
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3212
if selected_list == ['']:
3133
3213
# workaround - commit of root of tree should be exactly the same
3134
3214
# as just default commit in that tree, and succeed even though
3184
3267
# make_commit_message_template_encoded returns user encoding.
3185
3268
# 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)
3270
my_message = set_commit_message(commit_obj)
3271
if my_message is None:
3272
start_message = generate_commit_message_template(commit_obj)
3273
my_message = edit_commit_message_encoded(text,
3274
start_message=start_message)
3190
3275
if my_message is None:
3191
3276
raise errors.BzrCommandError("please specify a commit"
3192
3277
" message with either --message or --file")
3205
3290
reporter=None, verbose=verbose, revprops=properties,
3206
3291
authors=author, timestamp=commit_stamp,
3207
3292
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3293
exclude=tree.safe_relpath_files(exclude),
3209
3295
except PointlessCommit:
3210
3296
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3297
" Please 'bzr add' the files you want to commit, or use"
3298
" --unchanged to force an empty commit.")
3212
3299
except ConflictsInTree:
3213
3300
raise errors.BzrCommandError('Conflicts detected in working '
3214
3301
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3297
3384
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.
3385
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3387
When the default format has changed after a major new release of
3388
Bazaar, you may be informed during certain operations that you
3389
should upgrade. Upgrading to a newer format may improve performance
3390
or make new features available. It may however limit interoperability
3391
with older repositories or with older versions of Bazaar.
3393
If you wish to upgrade to a particular format rather than the
3394
current default, that can be specified using the --format option.
3395
As a consequence, you can use the upgrade command this way to
3396
"downgrade" to an earlier format, though some conversions are
3397
a one way process (e.g. changing from the 1.x default to the
3398
2.x default) so downgrading is not always possible.
3400
A backup.bzr.~#~ directory is created at the start of the conversion
3401
process (where # is a number). By default, this is left there on
3402
completion. If the conversion fails, delete the new .bzr directory
3403
and rename this one back in its place. Use the --clean option to ask
3404
for the backup.bzr directory to be removed on successful conversion.
3405
Alternatively, you can delete it by hand if everything looks good
3408
If the location given is a shared repository, dependent branches
3409
are also converted provided the repository converts successfully.
3410
If the conversion of a branch fails, remaining branches are still
3413
For more information on upgrades, see the Bazaar Upgrade Guide,
3414
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3417
_see_also = ['check', 'reconcile', 'formats']
3306
3418
takes_args = ['url?']
3307
3419
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'),
3420
RegistryOption('format',
3421
help='Upgrade to a specific format. See "bzr help'
3422
' formats" for details.',
3423
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3424
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3425
value_switches=True, title='Branch format'),
3427
help='Remove the backup.bzr directory if successful.'),
3429
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3432
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3433
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3434
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3436
if len(exceptions) == 1:
3437
# Compatibility with historical behavior
3321
3443
class cmd_whoami(Command):
3340
3463
encoding_type = 'replace'
3342
3465
@display_command
3343
def run(self, email=False, branch=False, name=None):
3466
def run(self, email=False, branch=False, name=None, directory=None):
3344
3467
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()
3468
if directory is None:
3469
# use branch if we're inside one; otherwise global config
3471
c = Branch.open_containing(u'.')[0].get_config()
3472
except errors.NotBranchError:
3473
c = _mod_config.GlobalConfig()
3475
c = Branch.open(directory).get_config()
3351
3477
self.outf.write(c.user_email() + '\n')
3353
3479
self.outf.write(c.username() + '\n')
3483
raise errors.BzrCommandError("--email can only be used to display existing "
3356
3486
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3488
_mod_config.extract_email_address(name)
3359
3489
except errors.NoEmailInUsername, e:
3360
3490
warning('"%s" does not seem to contain an email address. '
3361
3491
'This is allowed, but not recommended.', name)
3363
3493
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3495
if directory is None:
3496
c = Branch.open_containing(u'.')[0].get_config()
3498
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3500
c = _mod_config.GlobalConfig()
3368
3501
c.set_user_option('email', name)
3436
3570
'bzr alias --remove expects an alias to remove.')
3437
3571
# If alias is not found, print something like:
3438
3572
# unalias: foo: not found
3439
c = config.GlobalConfig()
3573
c = _mod_config.GlobalConfig()
3440
3574
c.unset_alias(alias_name)
3442
3576
@display_command
3443
3577
def print_aliases(self):
3444
3578
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3579
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3580
for key, value in sorted(aliases.iteritems()):
3447
3581
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3515
3652
if typestring == "sftp":
3516
3653
from bzrlib.tests import stub_sftp
3517
3654
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3655
elif typestring == "memory":
3519
3656
from bzrlib.tests import test_server
3520
3657
return memory.MemoryServer
3521
if typestring == "fakenfs":
3658
elif typestring == "fakenfs":
3522
3659
from bzrlib.tests import test_server
3523
3660
return test_server.FakeNFSServer
3524
3661
msg = "No known transport type %s. Supported types are: sftp\n" %\
3537
3674
'throughout the test suite.',
3538
3675
type=get_transport_type),
3539
3676
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3677
help='Run the benchmarks rather than selftests.',
3541
3679
Option('lsprof-timed',
3542
3680
help='Generate lsprof output for benchmarked'
3543
3681
' sections of code.'),
3544
3682
Option('lsprof-tests',
3545
3683
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3684
Option('first',
3550
3685
help='Run all tests, but run specified tests first.',
3551
3686
short_name='f',
3560
3695
Option('randomize', type=str, argname="SEED",
3561
3696
help='Randomize the order of tests using the given'
3562
3697
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3698
ListOption('exclude', type=str, argname="PATTERN",
3700
help='Exclude tests that match this regular'
3567
3702
Option('subunit',
3568
3703
help='Output test progress via subunit.'),
3569
3704
Option('strict', help='Fail on missing dependencies or '
3586
3721
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3722
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3724
first=False, list_only=False,
3590
3725
randomize=None, exclude=None, strict=False,
3591
3726
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
3727
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)
3728
from bzrlib import tests
3602
3730
if testspecs_list is not None:
3603
3731
pattern = '|'.join(testspecs_list)
3612
3740
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3741
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3742
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3743
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3744
# following code can be deleted when it's sufficiently deployed
3745
# -- vila/mgz 20100514
3746
if (sys.platform == "win32"
3747
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3749
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3751
self.additional_selftest_args.setdefault(
3620
3752
'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)
3754
raise errors.BzrCommandError(
3755
"--benchmark is no longer supported from bzr 2.2; "
3756
"use bzr-usertest instead")
3757
test_suite_factory = None
3759
exclude_pattern = None
3629
test_suite_factory = None
3761
exclude_pattern = '(' + '|'.join(exclude) + ')'
3631
3762
selftest_kwargs = {"verbose": verbose,
3632
3763
"pattern": pattern,
3633
3764
"stop_on_failure": one,
3635
3766
"test_suite_factory": test_suite_factory,
3636
3767
"lsprof_timed": lsprof_timed,
3637
3768
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3769
"matching_tests_first": first,
3640
3770
"list_only": list_only,
3641
3771
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3772
"exclude_pattern": exclude_pattern,
3643
3773
"strict": strict,
3644
3774
"load_list": load_list,
3645
3775
"debug_flags": debugflag,
3646
3776
"starting_with": starting_with
3648
3778
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3780
# Make deprecation warnings visible, unless -Werror is set
3781
cleanup = symbol_versioning.activate_deprecation_warnings(
3784
result = tests.selftest(**selftest_kwargs)
3650
3787
return int(not result)
3709
3844
The source of the merge can be specified either in the form of a branch,
3710
3845
or in the form of a path to a file containing a merge directive generated
3711
3846
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.
3847
or the branch most recently merged using --remember. The source of the
3848
merge may also be specified in the form of a path to a file in another
3849
branch: in this case, only the modifications to that file are merged into
3850
the current working tree.
3852
When merging from a branch, by default bzr will try to merge in all new
3853
work from the other branch, automatically determining an appropriate base
3854
revision. If this fails, you may need to give an explicit base.
3856
To pick a different ending revision, pass "--revision OTHER". bzr will
3857
try to merge in all new work up to and including revision OTHER.
3859
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3860
through OTHER, excluding BASE but including OTHER, will be merged. If this
3861
causes some revisions to be skipped, i.e. if the destination branch does
3862
not already contain revision BASE, such a merge is commonly referred to as
3863
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3864
cherrypicks. The changes look like a normal commit, and the history of the
3865
changes from the other branch is not stored in the commit.
3867
Revision numbers are always relative to the source branch.
3725
3869
Merge will do its best to combine the changes in two branches, but there
3726
3870
are some kinds of problems only a human can fix. When it encounters those,
3730
3874
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.
3876
If there is no default branch set, the first merge will set it (use
3877
--no-remember to avoid settting it). After that, you can omit the branch
3878
to use the default. To change the default, use --remember. The value will
3879
only be saved if the remote location can be accessed.
3737
3881
The results of the merge are placed into the destination working
3738
3882
directory, where they can be reviewed (with bzr diff), tested, and then
3739
3883
committed to record the result of the merge.
3741
3885
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
3886
--force is given. If --force is given, then the changes from the source
3887
will be merged with the current working tree, including any uncommitted
3888
changes in the tree. The --force option can also be used to create a
3743
3889
merge revision which has more than two parents.
3745
3891
If one would like to merge changes from the working tree of the other
3793
3939
' completely merged into the source, pull from the'
3794
3940
' source rather than merging. When this happens,'
3795
3941
' you do not need to commit the result.'),
3942
custom_help('directory',
3797
3943
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3944
'rather than the one containing the working directory.'),
3802
3945
Option('preview', help='Instead of merging, show a diff of the'
3804
3947
Option('interactive', help='Select changes interactively.',
3808
3951
def run(self, location=None, revision=None, force=False,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
3952
merge_type=None, show_base=False, reprocess=None, remember=None,
3810
3953
uncommitted=False, pull=False,
3811
3954
directory=None,
3873
4019
self.sanity_check_merger(merger)
3874
4020
if (merger.base_rev_id == merger.other_rev_id and
3875
4021
merger.other_rev_id is not None):
4022
# check if location is a nonexistent file (and not a branch) to
4023
# disambiguate the 'Nothing to do'
4024
if merger.interesting_files:
4025
if not merger.other_tree.has_filename(
4026
merger.interesting_files[0]):
4027
note("merger: " + str(merger))
4028
raise errors.PathsDoNotExist([location])
3876
4029
note('Nothing to do.')
4031
if pull and not preview:
3879
4032
if merger.interesting_files is not None:
3880
4033
raise errors.BzrCommandError('Cannot pull individual files')
3881
4034
if (merger.base_rev_id == tree.last_revision()):
3905
4058
def _do_preview(self, merger):
3906
4059
from bzrlib.diff import show_diff_trees
3907
4060
result_tree = self._get_preview(merger)
4061
path_encoding = osutils.get_diff_header_encoding()
3908
4062
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
4063
old_label='', new_label='',
4064
path_encoding=path_encoding)
3911
4066
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
4067
merger.change_reporter = change_reporter
3988
4143
if other_revision_id is None:
3989
4144
other_revision_id = _mod_revision.ensure_null(
3990
4145
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):
4146
# Remember where we merge from. We need to remember if:
4147
# - user specify a location (and we don't merge from the parent
4149
# - user ask to remember or there is no previous location set to merge
4150
# from and user didn't ask to *not* remember
4151
if (user_location is not None
4153
or (remember is None
4154
and tree.branch.get_submit_branch() is None)))):
3994
4155
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4156
# Merge tags (but don't set them in the master branch yet, the user
4157
# might revert this merge). Commit will propagate them.
4158
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4159
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4160
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4161
if other_path != '':
4167
4329
last committed revision is used.
4169
4331
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.
4332
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4333
will remove the changes introduced by the second last commit (-2), without
4334
affecting the changes introduced by the last commit (-1). To remove
4335
certain changes on a hunk-by-hunk basis, see the shelve command.
4174
4337
By default, any files that have been manually changed will be backed up
4175
4338
first. (Files changed only by merge are not backed up.) Backup files have
4340
4503
theirs_only=False,
4341
4504
log_format=None, long=False, short=False, line=False,
4342
4505
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4506
include_merges=False, revision=None, my_revision=None,
4344
4508
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4509
def message(s):
4346
4510
if not is_quiet():
4507
4668
@display_command
4508
4669
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")
4670
from bzrlib import plugin
4671
# Don't give writelines a generator as some codecs don't like that
4672
self.outf.writelines(
4673
list(plugin.describe_plugins(show_paths=verbose)))
4531
4676
class cmd_testament(Command):
4578
4722
Option('long', help='Show commit date in annotations.'),
4582
4727
encoding_type = 'exact'
4584
4729
@display_command
4585
4730
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4731
show_ids=False, directory=None):
4732
from bzrlib.annotate import (
4588
4735
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4736
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4737
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4738
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4740
self.add_cleanup(branch.lock_read().unlock)
4596
4741
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4742
self.add_cleanup(tree.lock_read().unlock)
4743
if wt is not None and revision is None:
4600
4744
file_id = wt.path2id(relpath)
4602
4746
file_id = tree.path2id(relpath)
4603
4747
if file_id is None:
4604
4748
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4749
if wt is not None and revision is None:
4607
4750
# If there is a tree and we're not annotating historical
4608
4751
# versions, annotate the working tree's content.
4609
4752
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4753
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4755
annotate_file_tree(tree, file_id, self.outf, long, all,
4756
show_ids=show_ids, branch=branch)
4616
4759
class cmd_re_sign(Command):
4620
4763
hidden = True # is this right ?
4621
4764
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4765
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4767
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4768
if revision_id_list is not None and revision is not None:
4626
4769
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4770
if revision_id_list is None and revision is None:
4628
4771
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)
4772
b = WorkingTree.open_containing(directory)[0].branch
4773
self.add_cleanup(b.lock_write().unlock)
4632
4774
return self._run(b, revision_id_list, revision)
4634
4776
def _run(self, b, revision_id_list, revision):
4694
4836
_see_also = ['checkouts', 'unbind']
4695
4837
takes_args = ['location?']
4838
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4840
def run(self, location=None, directory=u'.'):
4841
b, relpath = Branch.open_containing(directory)
4700
4842
if location is None:
4702
4844
location = b.get_old_bound_location()
4784
4926
b = control.open_branch()
4786
4928
if tree is not None:
4788
self.add_cleanup(tree.unlock)
4929
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4931
self.add_cleanup(b.lock_write().unlock)
4792
4932
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4794
4934
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4859
5005
bzr break-lock bzr+ssh://example.com/bzr/foo
5006
bzr break-lock --conf ~/.bazaar
4861
5009
takes_args = ['location?']
5012
help='LOCATION is the directory where the config lock is.'),
5014
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5017
def run(self, location=None, config=False, force=False):
4864
5018
if location is None:
4865
5019
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5021
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5023
{'bzrlib.lockdir.break': True})
5025
conf = _mod_config.LockableConfig(file_name=location)
5028
control, relpath = bzrdir.BzrDir.open_containing(location)
5030
control.break_lock()
5031
except NotImplementedError:
4873
5035
class cmd_wait_until_signalled(Command):
4938
5099
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
5100
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
5101
from bzrlib import transport
4941
5102
if directory is None:
4942
5103
directory = os.getcwd()
4943
5104
if protocol is None:
4944
protocol = transport_server_registry.get()
5105
protocol = transport.transport_server_registry.get()
4945
5106
host, port = self.get_host_and_port(port)
4946
5107
url = urlutils.local_path_to_url(directory)
4947
5108
if not allow_writes:
4948
5109
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5110
t = transport.get_transport(url)
5111
protocol(t, host, port, inet)
4953
5114
class cmd_join(Command):
5064
5226
encoding_type = 'exact'
5066
5228
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5229
sign=False, revision=None, mail_to=None, message=None,
5068
5231
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5232
include_patch, include_bundle = {
5070
5233
'plain': (False, False),
5071
5234
'diff': (True, False),
5072
5235
'bundle': (True, True),
5074
branch = Branch.open('.')
5237
branch = Branch.open(directory)
5075
5238
stored_submit_branch = branch.get_submit_branch()
5076
5239
if submit_branch is None:
5077
5240
submit_branch = stored_submit_branch
5153
5316
source branch defaults to that containing the working directory, but can
5154
5317
be changed using --from.
5319
Both the submit branch and the public branch follow the usual behavior with
5320
respect to --remember: If there is no default location set, the first send
5321
will set it (use --no-remember to avoid settting it). After that, you can
5322
omit the location to use the default. To change the default, use
5323
--remember. The value will only be saved if the location can be accessed.
5156
5325
In order to calculate those changes, bzr must analyse the submit branch.
5157
5326
Therefore it is most efficient for the submit branch to be a local mirror.
5158
5327
If a public location is known for the submit_branch, that location is used
5229
5398
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5399
no_patch=False, revision=None, remember=None, output=None,
5231
5400
format=None, mail_to=None, message=None, body=None,
5232
5401
strict=None, **kwargs):
5233
5402
from bzrlib.send import send
5393
5558
_see_also = ['tag']
5394
5559
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5560
custom_help('directory',
5561
help='Branch whose tags should be displayed.'),
5562
RegistryOption('sort',
5401
5563
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5564
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5570
@display_command
5571
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5572
from bzrlib.tag import tag_sort_methods
5416
5573
branch, relpath = Branch.open_containing(directory)
5418
5575
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5579
self.add_cleanup(branch.lock_read().unlock)
5425
5581
graph = branch.repository.get_graph()
5426
5582
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5428
5584
# only show revisions between revid1 and revid2 (inclusive)
5429
5585
tags = [(tag, revid) for tag, revid in tags if
5430
5586
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]])
5588
sort = tag_sort_methods.get()
5444
5590
if not show_ids:
5445
5591
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5592
for index, (tag, revid) in enumerate(tags):
5584
5731
def run(self, to_location=None, force=False, create_branch=False,
5732
revision=None, directory=u'.'):
5586
5733
from bzrlib import switch
5734
tree_location = directory
5588
5735
revision = _get_one_revision('switch', revision)
5589
5736
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5737
if to_location is None:
5591
5738
if revision is None:
5592
5739
raise errors.BzrCommandError('You must supply either a'
5593
5740
' revision or a location')
5741
to_location = tree_location
5596
5743
branch = control_dir.open_branch()
5597
5744
had_explicit_nick = branch.get_config().has_explicit_nickname()
5868
6016
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6017
restore the most recently shelved changes.
6019
For complicated changes, it is possible to edit the changes in a separate
6020
editor program to decide what the file remaining in the working copy
6021
should look like. To do this, add the configuration option
6023
change_editor = PROGRAM @new_path @old_path
6025
where @new_path is replaced with the path of the new version of the
6026
file and @old_path is replaced with the path of the old version of
6027
the file. The PROGRAM should save the new file with the desired
6028
contents of the file in the working tree.
5872
6032
takes_args = ['file*']
5874
6034
takes_options = [
5876
6037
Option('all', help='Shelve all changes.'),
5883
6044
Option('destroy',
5884
6045
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6047
_see_also = ['unshelve', 'configuration']
5888
6049
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6050
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6052
return self.run_for_list(directory=directory)
5892
6053
from bzrlib.shelf_ui import Shelver
5893
6054
if writer is None:
5894
6055
writer = bzrlib.option.diff_writer_registry.get()
5896
6057
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6058
file_list, message, destroy=destroy, directory=directory)
5967
6130
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'
6132
takes_options = ['directory',
6133
Option('ignored', help='Delete all ignored files.'),
6134
Option('detritus', help='Delete conflict files, merge and revert'
5971
6135
' backups, and failed selftest dirs.'),
5972
6136
Option('unknown',
5973
6137
help='Delete files unknown to bzr (default).'),
5975
6139
' deleting them.'),
5976
6140
Option('force', help='Do not prompt before deleting.')]
5977
6141
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6142
force=False, directory=u'.'):
5979
6143
from bzrlib.clean_tree import clean_tree
5980
6144
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6148
clean_tree(directory, unknown=unknown, ignored=ignored,
6149
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6152
class cmd_reference(Command):
6032
6196
self.outf.write('%s %s\n' % (path, location))
6199
class cmd_export_pot(Command):
6200
__doc__ = """Export command helps and error messages in po format."""
6205
from bzrlib.export_pot import export_pot
6206
export_pot(self.outf)
6035
6209
def _register_lazy_builtins():
6036
6210
# register lazy builtins from other modules; called at startup and should
6037
6211
# be only called once.
6038
6212
for (name, aliases, module_name) in [
6039
6213
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6214
('cmd_config', [], 'bzrlib.config'),
6040
6215
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6216
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6217
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6218
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
6219
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6220
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6222
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
