71
73
_parse_revision_str,
73
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
79
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
80
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
82
return internal_tree_files(file_list, default_branch, canonicalize,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
86
88
def tree_files_for_add(file_list):
151
153
# XXX: Bad function name; should possibly also be a class method of
152
154
# WorkingTree rather than a function.
153
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
154
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
155
156
apply_view=True):
156
157
"""Convert command-line paths to a WorkingTree and relative paths.
158
Deprecated: use WorkingTree.open_containing_paths instead.
160
159
This is typically used for command-line processors that take one or
161
160
more filenames, and infer the workingtree that contains them.
173
172
:return: workingtree, [relative_paths]
175
return WorkingTree.open_containing_paths(
176
file_list, default_directory='.',
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
181
223
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)
201
235
# TODO: Make sure no commands unconditionally use the working directory as a
202
236
# branch. If a filename argument is used, the first of them should be used to
203
237
# specify the branch. (Perhaps this can be factored out into some kind of
252
286
To skip the display of pending merge information altogether, use
253
287
the no-pending option or specify a file/directory.
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'.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
263
293
# TODO: --no-recurse, --recurse options
323
353
self.outf.write(revtext.decode('utf-8'))
326
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
327
357
if revision_id is not None and revision is not None:
328
358
raise errors.BzrCommandError('You can only supply one of'
329
359
' revision_id or --revision')
330
360
if revision_id is None and revision is None:
331
361
raise errors.BzrCommandError('You must supply either'
332
362
' --revision or a revision_id')
334
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
363
b = WorkingTree.open_containing(u'.')[0].branch
336
365
revisions = b.repository.revisions
337
366
if revisions is None:
487
511
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'
543
514
class cmd_revno(Command):
544
515
__doc__ = """Show current revision number.
780
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
782
761
revision = _get_one_revision('inventory', revision)
783
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
784
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
785
765
if revision is not None:
786
766
tree = revision.as_tree(work_tree.branch)
788
768
extra_trees = [work_tree]
789
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
852
833
if len(names_list) < 2:
853
834
raise errors.BzrCommandError("missing file argument")
854
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
855
self.add_cleanup(tree.lock_tree_write().unlock)
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
856
838
self._run(tree, names_list, rel_names, after)
858
840
def run_auto(self, names_list, after, dry_run):
863
845
raise errors.BzrCommandError('--after cannot be specified with'
865
work_tree, file_list = WorkingTree.open_containing_paths(
866
names_list, default_directory='.')
867
self.add_cleanup(work_tree.lock_tree_write().unlock)
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
868
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
870
852
def _run(self, tree, names_list, rel_names, after):
964
946
match the remote one, use pull --overwrite. This will work even if the two
965
947
branches have diverged.
967
If there is no default location set, the first pull will set it (use
968
--no-remember to avoid settting it). After that, you can omit the
969
location to use the default. To change the default, use --remember. The
970
value will only be saved if the remote location can be accessed.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
972
954
Note: The location can be specified either in the form of a branch,
973
955
or in the form of a path to a file containing a merge directive generated
978
960
takes_options = ['remember', 'overwrite', 'revision',
979
961
custom_help('verbose',
980
962
help='Show logs of pulled revisions.'),
981
custom_help('directory',
982
964
help='Branch to pull into, '
983
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
985
970
help="Perform a local pull in a bound "
986
971
"branch. Local pulls are not applied to "
987
972
"the master branch."
990
help="Show base revision text in conflicts.")
992
975
takes_args = ['location?']
993
976
encoding_type = 'replace'
995
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
996
979
revision=None, verbose=False,
997
directory=None, local=False,
980
directory=None, local=False):
999
981
# FIXME: too much stuff is in the command class
1000
982
revision_id = None
1001
983
mergeable = None
1005
987
tree_to = WorkingTree.open_containing(directory)[0]
1006
988
branch_to = tree_to.branch
1007
self.add_cleanup(tree_to.lock_write().unlock)
990
self.add_cleanup(tree_to.unlock)
1008
991
except errors.NoWorkingTree:
1010
993
branch_to = Branch.open_containing(directory)[0]
1011
self.add_cleanup(branch_to.lock_write().unlock)
1013
if tree_to is None and show_base:
1014
raise errors.BzrCommandError("Need working tree for --show-base.")
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1016
997
if local and not branch_to.get_bound_location():
1017
998
raise errors.LocalRequiresBoundBranch()
1101
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1102
1078
After that you will be able to do a push without '--overwrite'.
1104
If there is no default push location set, the first push will set it (use
1105
--no-remember to avoid settting it). After that, you can omit the
1106
location to use the default. To change the default, use --remember. The
1107
value will only be saved if the remote location can be accessed.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1110
1086
_see_also = ['pull', 'update', 'working-trees']
1112
1088
Option('create-prefix',
1113
1089
help='Create the path leading up to the branch '
1114
1090
'if it does not already exist.'),
1115
custom_help('directory',
1116
1092
help='Branch to push from, '
1117
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1118
1097
Option('use-existing-dir',
1119
1098
help='By default push will fail if the target'
1120
1099
' directory exists, but does not already'
1131
1110
Option('strict',
1132
1111
help='Refuse to push if there are uncommitted changes in'
1133
1112
' the working tree, --no-strict disables the check.'),
1135
help="Don't populate the working tree, even for protocols"
1136
" that support it."),
1138
1114
takes_args = ['location?']
1139
1115
encoding_type = 'replace'
1141
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1142
1118
create_prefix=False, verbose=False, revision=None,
1143
1119
use_existing_dir=False, directory=None, stacked_on=None,
1144
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1145
1121
from bzrlib.push import _show_push_branch
1147
1123
if directory is None:
1193
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1194
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1195
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1196
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1199
1175
class cmd_branch(Command):
1209
1185
To retrieve the branch as of a particular revision, supply the --revision
1210
1186
parameter, as in "branch foo/bar -r 5".
1212
The synonyms 'clone' and 'get' for this command are deprecated.
1215
1189
_see_also = ['checkout']
1216
1190
takes_args = ['from_location', 'to_location?']
1217
takes_options = ['revision',
1218
Option('hardlink', help='Hard-link working tree files where possible.'),
1219
Option('files-from', type=str,
1220
help="Get file contents from this tree."),
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1221
1193
Option('no-tree',
1222
1194
help="Create a branch without a working-tree."),
1223
1195
Option('switch',
1242
1214
def run(self, from_location, to_location=None, revision=None,
1243
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1244
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1246
1217
from bzrlib import switch as _mod_switch
1247
1218
from bzrlib.tag import _merge_tags_if_possible
1248
if self.invoked_as in ['get', 'clone']:
1249
ui.ui_factory.show_user_warning(
1250
'deprecated_command',
1251
deprecated_name=self.invoked_as,
1252
recommended_name='branch',
1253
deprecated_in_version='2.4')
1254
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1256
if not (hardlink or files_from):
1257
# accelerator_tree is usually slower because you have to read N
1258
# files (no readahead, lots of seeks, etc), but allow the user to
1259
# explicitly request it
1260
accelerator_tree = None
1261
if files_from is not None and files_from != from_location:
1262
accelerator_tree = WorkingTree.open(files_from)
1263
1221
revision = _get_one_revision('branch', revision)
1264
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1265
1224
if revision is not None:
1266
1225
revision_id = revision.as_revision_id(br_from)
1372
1331
to_location = branch_location
1373
1332
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1374
1333
branch_location)
1375
if not (hardlink or files_from):
1376
# accelerator_tree is usually slower because you have to read N
1377
# files (no readahead, lots of seeks, etc), but allow the user to
1378
# explicitly request it
1379
accelerator_tree = None
1380
1334
revision = _get_one_revision('checkout', revision)
1381
if files_from is not None and files_from != branch_location:
1335
if files_from is not None:
1382
1336
accelerator_tree = WorkingTree.open(files_from)
1383
1337
if revision is not None:
1384
1338
revision_id = revision.as_revision_id(source)
1440
1396
If you want to discard your local changes, you can just do a
1441
1397
'bzr revert' instead of 'bzr commit' after the update.
1443
If you want to restore a file that has been removed locally, use
1444
'bzr revert' instead of 'bzr update'.
1446
1399
If the tree's branch is bound to a master branch, it will also update
1447
1400
the branch from the master.
1450
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1451
1404
takes_args = ['dir?']
1452
takes_options = ['revision',
1454
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1456
1406
aliases = ['up']
1458
def run(self, dir='.', revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1459
1409
if revision is not None and len(revision) != 1:
1460
1410
raise errors.BzrCommandError(
1461
1411
"bzr update --revision takes exactly one revision")
1570
1519
class cmd_remove(Command):
1571
1520
__doc__ = """Remove files or directories.
1573
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1574
delete them if they can easily be recovered using revert otherwise they
1575
will be backed up (adding an extention of the form .~#~). If no options or
1576
parameters are given Bazaar will scan for files that are being tracked by
1577
Bazaar but missing in your tree and stop tracking them for you.
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1579
1527
takes_args = ['file*']
1580
1528
takes_options = ['verbose',
1582
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1583
1531
'The file deletion mode to be used.',
1584
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1585
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1586
1535
keep='Delete from bzr but leave the working copy.',
1587
no_backup='Don\'t backup changed files.',
1588
1536
force='Delete all the specified files, even if they can not be '
1589
'recovered and even if they are non-empty directories. '
1590
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1591
1538
aliases = ['rm', 'del']
1592
1539
encoding_type = 'replace'
1594
1541
def run(self, file_list, verbose=False, new=False,
1595
1542
file_deletion_strategy='safe'):
1596
if file_deletion_strategy == 'force':
1597
note("(The --force option is deprecated, rather use --no-backup "
1599
file_deletion_strategy = 'no-backup'
1601
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1603
1545
if file_list is not None:
1604
1546
file_list = [f for f in file_list]
1606
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1607
1550
# Heuristics should probably all move into tree.remove_smart or
1693
1636
_see_also = ['check']
1694
1637
takes_args = ['branch?']
1696
Option('canonicalize-chks',
1697
help='Make sure CHKs are in canonical form (repairs '
1702
def run(self, branch=".", canonicalize_chks=False):
1639
def run(self, branch="."):
1703
1640
from bzrlib.reconcile import reconcile
1704
1641
dir = bzrdir.BzrDir.open(branch)
1705
reconcile(dir, canonicalize_chks=canonicalize_chks)
1708
1645
class cmd_revision_history(Command):
1786
1723
Option('append-revisions-only',
1787
1724
help='Never change revnos or the existing log.'
1788
' Append revisions to it only.'),
1790
'Create a branch without a working tree.')
1725
' Append revisions to it only.')
1792
1727
def run(self, location=None, format=None, append_revisions_only=False,
1793
create_prefix=False, no_tree=False):
1728
create_prefix=False):
1794
1729
if format is None:
1795
1730
format = bzrdir.format_registry.make_bzrdir('default')
1796
1731
if location is None:
2073
1985
old_branch, new_branch,
2074
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2075
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2076
# GNU diff on Windows uses ANSI encoding for filenames
2077
path_encoding = osutils.get_diff_header_encoding()
2078
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2079
1989
specific_files=specific_files,
2080
1990
external_diff_options=diff_options,
2081
1991
old_label=old_label, new_label=new_label,
2082
extra_trees=extra_trees,
2083
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2085
1993
format_cls=format)
2095
2003
# level of effort but possibly much less IO. (Or possibly not,
2096
2004
# if the directories are very large...)
2097
2005
_see_also = ['status', 'ls']
2098
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
2100
2008
@display_command
2101
def run(self, show_ids=False, directory=u'.'):
2102
tree = WorkingTree.open_containing(directory)[0]
2103
self.add_cleanup(tree.lock_read().unlock)
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2104
2013
old = tree.basis_tree()
2105
self.add_cleanup(old.lock_read().unlock)
2015
self.add_cleanup(old.unlock)
2106
2016
for path, ie in old.inventory.iter_entries():
2107
2017
if not tree.has_id(ie.file_id):
2108
2018
self.outf.write(path)
2120
2030
_see_also = ['status', 'ls']
2121
takes_options = ['directory', 'null']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2123
2037
@display_command
2124
def run(self, null=False, directory=u'.'):
2125
tree = WorkingTree.open_containing(directory)[0]
2126
self.add_cleanup(tree.lock_read().unlock)
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2127
2040
td = tree.changes_from(tree.basis_tree())
2129
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2131
2043
self.outf.write(path + '\0')
2141
2053
_see_also = ['status', 'ls']
2142
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2144
2060
@display_command
2145
def run(self, null=False, directory=u'.'):
2146
wt = WorkingTree.open_containing(directory)[0]
2147
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2148
2065
basis = wt.basis_tree()
2149
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2150
2068
basis_inv = basis.inventory
2151
2069
inv = wt.inventory
2152
2070
for file_id in inv:
2614
2528
help='Recurse into subdirectories.'),
2615
2529
Option('from-root',
2616
2530
help='Print paths relative to the root of the branch.'),
2617
Option('unknown', short_name='u',
2618
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2619
2532
Option('versioned', help='Print versioned files.',
2620
2533
short_name='V'),
2621
Option('ignored', short_name='i',
2622
help='Print ignored files.'),
2623
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2624
2539
help='List entries of a particular kind: file, directory, symlink.',
2630
2543
@display_command
2631
2544
def run(self, revision=None, verbose=False,
2632
2545
recursive=False, from_root=False,
2633
2546
unknown=False, versioned=False, ignored=False,
2634
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2636
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2637
2550
raise errors.BzrCommandError('invalid kind specified')
2809
2713
_see_also = ['status', 'ignored', 'patterns']
2810
2714
takes_args = ['name_pattern*']
2811
takes_options = ['directory',
2812
2716
Option('default-rules',
2813
2717
help='Display the default ignore rules that bzr uses.')
2816
def run(self, name_pattern_list=None, default_rules=None,
2720
def run(self, name_pattern_list=None, default_rules=None):
2818
2721
from bzrlib import ignores
2819
2722
if default_rules is not None:
2820
2723
# dump the default rules and exit
2826
2729
"NAME_PATTERN or --default-rules.")
2827
2730
name_pattern_list = [globbing.normalize_pattern(p)
2828
2731
for p in name_pattern_list]
2830
for p in name_pattern_list:
2831
if not globbing.Globster.is_pattern_valid(p):
2832
bad_patterns += ('\n %s' % p)
2834
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2835
ui.ui_factory.show_error(msg)
2836
raise errors.InvalidPattern('')
2837
2732
for name_pattern in name_pattern_list:
2838
2733
if (name_pattern[0] == '/' or
2839
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2840
2735
raise errors.BzrCommandError(
2841
2736
"NAME_PATTERN should not be an absolute path")
2842
tree, relpath = WorkingTree.open_containing(directory)
2737
tree, relpath = WorkingTree.open_containing(u'.')
2843
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2844
2739
ignored = globbing.Globster(name_pattern_list)
2846
self.add_cleanup(tree.lock_read().unlock)
2847
2742
for entry in tree.list_files():
2849
2744
if id is not None:
2850
2745
filename = entry[0]
2851
2746
if ignored.match(filename):
2852
2747
matches.append(filename)
2853
2749
if len(matches) > 0:
2854
2750
self.outf.write("Warning: the following files are version controlled and"
2855
2751
" match your ignore pattern:\n%s"
2871
2767
encoding_type = 'replace'
2872
2768
_see_also = ['ignore', 'ls']
2873
takes_options = ['directory']
2875
2770
@display_command
2876
def run(self, directory=u'.'):
2877
tree = WorkingTree.open_containing(directory)[0]
2878
self.add_cleanup(tree.lock_read().unlock)
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2879
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2880
2776
if file_class != 'I':
2950
2844
'revision in which it was changed.'),
2952
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2953
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
2954
2848
from bzrlib.export import export
2956
2850
if branch_or_subdir is None:
2957
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
2958
2852
b = tree.branch
2991
2885
@display_command
2992
2886
def run(self, filename, revision=None, name_from_revision=False,
2993
filters=False, directory=None):
2994
2888
if revision is not None and len(revision) != 1:
2995
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2996
2890
" one revision specifier")
2997
2891
tree, branch, relpath = \
2998
_open_directory_or_containing_tree_or_branch(filename, directory)
2999
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3000
2895
return self._run(tree, branch, relpath, filename, revision,
3001
2896
name_from_revision, filters)
3117
3013
to trigger updates to external systems like bug trackers. The --fixes
3118
3014
option can be used to record the association between a revision and
3119
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3122
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3123
3044
takes_args = ['selected*']
3184
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3185
3102
unchanged=False, strict=False, local=False, fixes=None,
3186
author=None, show_diff=False, exclude=None, commit_time=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3188
3104
from bzrlib.errors import (
3189
3105
PointlessCommit,
3190
3106
ConflictsInTree,
3204
3120
raise errors.BzrCommandError(
3205
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3207
3129
properties = {}
3209
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3131
tree, selected_list = tree_files(selected_list)
3210
3132
if selected_list == ['']:
3211
3133
# workaround - commit of root of tree should be exactly the same
3212
3134
# as just default commit in that tree, and succeed even though
3286
3205
reporter=None, verbose=verbose, revprops=properties,
3287
3206
authors=author, timestamp=commit_stamp,
3288
3207
timezone=offset,
3289
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3291
3209
except PointlessCommit:
3292
3210
raise errors.BzrCommandError("No changes to commit."
3293
" Please 'bzr add' the files you want to commit, or use"
3294
" --unchanged to force an empty commit.")
3211
" Use --unchanged to commit anyhow.")
3295
3212
except ConflictsInTree:
3296
3213
raise errors.BzrCommandError('Conflicts detected in working '
3297
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3380
3297
class cmd_upgrade(Command):
3381
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3383
When the default format has changed after a major new release of
3384
Bazaar, you may be informed during certain operations that you
3385
should upgrade. Upgrading to a newer format may improve performance
3386
or make new features available. It may however limit interoperability
3387
with older repositories or with older versions of Bazaar.
3389
If you wish to upgrade to a particular format rather than the
3390
current default, that can be specified using the --format option.
3391
As a consequence, you can use the upgrade command this way to
3392
"downgrade" to an earlier format, though some conversions are
3393
a one way process (e.g. changing from the 1.x default to the
3394
2.x default) so downgrading is not always possible.
3396
A backup.bzr.~#~ directory is created at the start of the conversion
3397
process (where # is a number). By default, this is left there on
3398
completion. If the conversion fails, delete the new .bzr directory
3399
and rename this one back in its place. Use the --clean option to ask
3400
for the backup.bzr directory to be removed on successful conversion.
3401
Alternatively, you can delete it by hand if everything looks good
3404
If the location given is a shared repository, dependent branches
3405
are also converted provided the repository converts successfully.
3406
If the conversion of a branch fails, remaining branches are still
3409
For more information on upgrades, see the Bazaar Upgrade Guide,
3410
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3413
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3414
3306
takes_args = ['url?']
3415
3307
takes_options = [
3416
RegistryOption('format',
3417
help='Upgrade to a specific format. See "bzr help'
3418
' formats" for details.',
3419
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3420
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3421
value_switches=True, title='Branch format'),
3423
help='Remove the backup.bzr directory if successful.'),
3425
help="Show what would be done, but don't actually do anything."),
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3428
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3429
3317
from bzrlib.upgrade import upgrade
3430
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3432
if len(exceptions) == 1:
3433
# Compatibility with historical behavior
3318
upgrade(url, format)
3439
3321
class cmd_whoami(Command):
3459
3340
encoding_type = 'replace'
3461
3342
@display_command
3462
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3463
3344
if name is None:
3464
if directory is None:
3465
# use branch if we're inside one; otherwise global config
3467
c = Branch.open_containing(u'.')[0].get_config()
3468
except errors.NotBranchError:
3469
c = _mod_config.GlobalConfig()
3471
c = Branch.open(directory).get_config()
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3473
3351
self.outf.write(c.user_email() + '\n')
3475
3353
self.outf.write(c.username() + '\n')
3479
raise errors.BzrCommandError("--email can only be used to display existing "
3482
3356
# display a warning if an email address isn't included in the given name.
3484
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3485
3359
except errors.NoEmailInUsername, e:
3486
3360
warning('"%s" does not seem to contain an email address. '
3487
3361
'This is allowed, but not recommended.', name)
3489
3363
# use global config unless --branch given
3491
if directory is None:
3492
c = Branch.open_containing(u'.')[0].get_config()
3494
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3496
c = _mod_config.GlobalConfig()
3367
c = config.GlobalConfig()
3497
3368
c.set_user_option('email', name)
3566
3436
'bzr alias --remove expects an alias to remove.')
3567
3437
# If alias is not found, print something like:
3568
3438
# unalias: foo: not found
3569
c = _mod_config.GlobalConfig()
3439
c = config.GlobalConfig()
3570
3440
c.unset_alias(alias_name)
3572
3442
@display_command
3573
3443
def print_aliases(self):
3574
3444
"""Print out the defined aliases in a similar format to bash."""
3575
aliases = _mod_config.GlobalConfig().get_aliases()
3445
aliases = config.GlobalConfig().get_aliases()
3576
3446
for key, value in sorted(aliases.iteritems()):
3577
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3648
3515
if typestring == "sftp":
3649
3516
from bzrlib.tests import stub_sftp
3650
3517
return stub_sftp.SFTPAbsoluteServer
3651
elif typestring == "memory":
3518
if typestring == "memory":
3652
3519
from bzrlib.tests import test_server
3653
3520
return memory.MemoryServer
3654
elif typestring == "fakenfs":
3521
if typestring == "fakenfs":
3655
3522
from bzrlib.tests import test_server
3656
3523
return test_server.FakeNFSServer
3657
3524
msg = "No known transport type %s. Supported types are: sftp\n" %\
3670
3537
'throughout the test suite.',
3671
3538
type=get_transport_type),
3672
3539
Option('benchmark',
3673
help='Run the benchmarks rather than selftests.',
3540
help='Run the benchmarks rather than selftests.'),
3675
3541
Option('lsprof-timed',
3676
3542
help='Generate lsprof output for benchmarked'
3677
3543
' sections of code.'),
3678
3544
Option('lsprof-tests',
3679
3545
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3680
3549
Option('first',
3681
3550
help='Run all tests, but run specified tests first.',
3682
3551
short_name='f',
3691
3560
Option('randomize', type=str, argname="SEED",
3692
3561
help='Randomize the order of tests using the given'
3693
3562
' seed or "now" for the current time.'),
3694
ListOption('exclude', type=str, argname="PATTERN",
3696
help='Exclude tests that match this regular'
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3698
3567
Option('subunit',
3699
3568
help='Output test progress via subunit.'),
3700
3569
Option('strict', help='Fail on missing dependencies or '
3717
3586
def run(self, testspecs_list=None, verbose=False, one=False,
3718
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3720
3589
first=False, list_only=False,
3721
3590
randomize=None, exclude=None, strict=False,
3722
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3723
3592
parallel=None, lsprof_tests=False):
3724
from bzrlib import tests
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)
3726
3602
if testspecs_list is not None:
3727
3603
pattern = '|'.join(testspecs_list)
3736
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3737
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3738
3614
# stdout, which would corrupt the subunit stream.
3739
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3740
# following code can be deleted when it's sufficiently deployed
3741
# -- vila/mgz 20100514
3742
if (sys.platform == "win32"
3743
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3745
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3747
3619
self.additional_selftest_args.setdefault(
3748
3620
'suite_decorators', []).append(parallel)
3750
raise errors.BzrCommandError(
3751
"--benchmark is no longer supported from bzr 2.2; "
3752
"use bzr-usertest instead")
3753
test_suite_factory = None
3755
exclude_pattern = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3757
exclude_pattern = '(' + '|'.join(exclude) + ')'
3629
test_suite_factory = None
3758
3631
selftest_kwargs = {"verbose": verbose,
3759
3632
"pattern": pattern,
3760
3633
"stop_on_failure": one,
3762
3635
"test_suite_factory": test_suite_factory,
3763
3636
"lsprof_timed": lsprof_timed,
3764
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3765
3639
"matching_tests_first": first,
3766
3640
"list_only": list_only,
3767
3641
"random_seed": randomize,
3768
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
3769
3643
"strict": strict,
3770
3644
"load_list": load_list,
3771
3645
"debug_flags": debugflag,
3772
3646
"starting_with": starting_with
3774
3648
selftest_kwargs.update(self.additional_selftest_args)
3776
# Make deprecation warnings visible, unless -Werror is set
3777
cleanup = symbol_versioning.activate_deprecation_warnings(
3780
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
3783
3650
return int(not result)
3840
3709
The source of the merge can be specified either in the form of a branch,
3841
3710
or in the form of a path to a file containing a merge directive generated
3842
3711
with bzr send. If neither is specified, the default is the upstream branch
3843
or the branch most recently merged using --remember. The source of the
3844
merge may also be specified in the form of a path to a file in another
3845
branch: in this case, only the modifications to that file are merged into
3846
the current working tree.
3848
When merging from a branch, by default bzr will try to merge in all new
3849
work from the other branch, automatically determining an appropriate base
3850
revision. If this fails, you may need to give an explicit base.
3852
To pick a different ending revision, pass "--revision OTHER". bzr will
3853
try to merge in all new work up to and including revision OTHER.
3855
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3856
through OTHER, excluding BASE but including OTHER, will be merged. If this
3857
causes some revisions to be skipped, i.e. if the destination branch does
3858
not already contain revision BASE, such a merge is commonly referred to as
3859
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3860
cherrypicks. The changes look like a normal commit, and the history of the
3861
changes from the other branch is not stored in the commit.
3863
Revision numbers are always relative to the source branch.
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
3865
3725
Merge will do its best to combine the changes in two branches, but there
3866
3726
are some kinds of problems only a human can fix. When it encounters those,
3870
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3872
If there is no default branch set, the first merge will set it (use
3873
--no-remember to avoid settting it). After that, you can omit the branch
3874
to use the default. To change the default, use --remember. The value will
3875
only be saved if the remote location can be accessed.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
3877
3737
The results of the merge are placed into the destination working
3878
3738
directory, where they can be reviewed (with bzr diff), tested, and then
3879
3739
committed to record the result of the merge.
3881
3741
merge refuses to run if there are any uncommitted changes, unless
3882
--force is given. If --force is given, then the changes from the source
3883
will be merged with the current working tree, including any uncommitted
3884
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
3885
3743
merge revision which has more than two parents.
3887
3745
If one would like to merge changes from the working tree of the other
3935
3793
' completely merged into the source, pull from the'
3936
3794
' source rather than merging. When this happens,'
3937
3795
' you do not need to commit the result.'),
3938
custom_help('directory',
3939
3797
help='Branch to merge into, '
3940
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
3941
3802
Option('preview', help='Instead of merging, show a diff of the'
3943
3804
Option('interactive', help='Select changes interactively.',
3947
3808
def run(self, location=None, revision=None, force=False,
3948
merge_type=None, show_base=False, reprocess=None, remember=None,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
3949
3810
uncommitted=False, pull=False,
3950
3811
directory=None,
4015
3873
self.sanity_check_merger(merger)
4016
3874
if (merger.base_rev_id == merger.other_rev_id and
4017
3875
merger.other_rev_id is not None):
4018
# check if location is a nonexistent file (and not a branch) to
4019
# disambiguate the 'Nothing to do'
4020
if merger.interesting_files:
4021
if not merger.other_tree.has_filename(
4022
merger.interesting_files[0]):
4023
note("merger: " + str(merger))
4024
raise errors.PathsDoNotExist([location])
4025
3876
note('Nothing to do.')
4027
if pull and not preview:
4028
3879
if merger.interesting_files is not None:
4029
3880
raise errors.BzrCommandError('Cannot pull individual files')
4030
3881
if (merger.base_rev_id == tree.last_revision()):
4054
3905
def _do_preview(self, merger):
4055
3906
from bzrlib.diff import show_diff_trees
4056
3907
result_tree = self._get_preview(merger)
4057
path_encoding = osutils.get_diff_header_encoding()
4058
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
4059
old_label='', new_label='',
4060
path_encoding=path_encoding)
3909
old_label='', new_label='')
4062
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4063
3912
merger.change_reporter = change_reporter
4139
3988
if other_revision_id is None:
4140
3989
other_revision_id = _mod_revision.ensure_null(
4141
3990
other_branch.last_revision())
4142
# Remember where we merge from. We need to remember if:
4143
# - user specify a location (and we don't merge from the parent
4145
# - user ask to remember or there is no previous location set to merge
4146
# from and user didn't ask to *not* remember
4147
if (user_location is not None
4149
or (remember is None
4150
and tree.branch.get_submit_branch() is None)))):
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4151
3994
tree.branch.set_submit_branch(other_branch.base)
4152
# Merge tags (but don't set them in the master branch yet, the user
4153
# might revert this merge). Commit will propagate them.
4154
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4155
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4156
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4157
3998
if other_path != '':
4325
4167
last committed revision is used.
4327
4169
To remove only some changes, without reverting to a prior version, use
4328
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4329
will remove the changes introduced by the second last commit (-2), without
4330
affecting the changes introduced by the last commit (-1). To remove
4331
certain changes on a hunk-by-hunk basis, see the shelve command.
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4333
4174
By default, any files that have been manually changed will be backed up
4334
4175
first. (Files changed only by merge are not backed up.) Backup files have
4499
4340
theirs_only=False,
4500
4341
log_format=None, long=False, short=False, line=False,
4501
4342
show_ids=False, verbose=False, this=False, other=False,
4502
include_merges=False, revision=None, my_revision=None,
4343
include_merges=False, revision=None, my_revision=None):
4504
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4505
4345
def message(s):
4506
4346
if not is_quiet():
4664
4507
@display_command
4665
4508
def run(self, verbose=False):
4666
from bzrlib import plugin
4667
# Don't give writelines a generator as some codecs don't like that
4668
self.outf.writelines(
4669
list(plugin.describe_plugins(show_paths=verbose)))
4509
import bzrlib.plugin
4510
from inspect import getdoc
4512
for name, plugin in bzrlib.plugin.plugins().items():
4513
version = plugin.__version__
4514
if version == 'unknown':
4516
name_ver = '%s %s' % (name, version)
4517
d = getdoc(plugin.module)
4519
doc = d.split('\n')[0]
4521
doc = '(no description)'
4522
result.append((name_ver, doc, plugin.path()))
4523
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4672
4531
class cmd_testament(Command):
4718
4578
Option('long', help='Show commit date in annotations.'),
4723
4582
encoding_type = 'exact'
4725
4584
@display_command
4726
4585
def run(self, filename, all=False, long=False, revision=None,
4727
show_ids=False, directory=None):
4728
from bzrlib.annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4731
4588
wt, branch, relpath = \
4732
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4733
4590
if wt is not None:
4734
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
4736
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4737
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4738
self.add_cleanup(tree.lock_read().unlock)
4739
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
4740
4600
file_id = wt.path2id(relpath)
4742
4602
file_id = tree.path2id(relpath)
4743
4603
if file_id is None:
4744
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4745
4606
if wt is not None and revision is None:
4746
4607
# If there is a tree and we're not annotating historical
4747
4608
# versions, annotate the working tree's content.
4748
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4749
4610
show_ids=show_ids)
4751
annotate_file_tree(tree, file_id, self.outf, long, all,
4752
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4755
4616
class cmd_re_sign(Command):
4759
4620
hidden = True # is this right ?
4760
4621
takes_args = ['revision_id*']
4761
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4763
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4764
4625
if revision_id_list is not None and revision is not None:
4765
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4766
4627
if revision_id_list is None and revision is None:
4767
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4768
b = WorkingTree.open_containing(directory)[0].branch
4769
self.add_cleanup(b.lock_write().unlock)
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4770
4632
return self._run(b, revision_id_list, revision)
4772
4634
def _run(self, b, revision_id_list, revision):
4832
4694
_see_also = ['checkouts', 'unbind']
4833
4695
takes_args = ['location?']
4834
takes_options = ['directory']
4836
def run(self, location=None, directory=u'.'):
4837
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4838
4700
if location is None:
4840
4702
location = b.get_old_bound_location()
4922
4784
b = control.open_branch()
4924
4786
if tree is not None:
4925
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
4927
self.add_cleanup(b.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4928
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4930
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5001
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5002
bzr break-lock --conf ~/.bazaar
5005
4861
takes_args = ['location?']
5008
help='LOCATION is the directory where the config lock is.'),
5010
help='Do not ask for confirmation before breaking the lock.'),
5013
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5014
4864
if location is None:
5015
4865
location = u'.'
5017
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5019
{'bzrlib.lockdir.break': True})
5021
conf = _mod_config.LockableConfig(file_name=location)
5024
control, relpath = bzrdir.BzrDir.open_containing(location)
5026
control.break_lock()
5027
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5031
4873
class cmd_wait_until_signalled(Command):
5095
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5096
4939
protocol=None):
5097
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5098
4941
if directory is None:
5099
4942
directory = os.getcwd()
5100
4943
if protocol is None:
5101
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5102
4945
host, port = self.get_host_and_port(port)
5103
4946
url = urlutils.local_path_to_url(directory)
5104
4947
if not allow_writes:
5105
4948
url = 'readonly+' + url
5106
t = transport.get_transport(url)
5107
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5110
4953
class cmd_join(Command):
5222
5064
encoding_type = 'exact'
5224
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5225
sign=False, revision=None, mail_to=None, message=None,
5067
sign=False, revision=None, mail_to=None, message=None):
5227
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5228
5069
include_patch, include_bundle = {
5229
5070
'plain': (False, False),
5230
5071
'diff': (True, False),
5231
5072
'bundle': (True, True),
5233
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5234
5075
stored_submit_branch = branch.get_submit_branch()
5235
5076
if submit_branch is None:
5236
5077
submit_branch = stored_submit_branch
5312
5153
source branch defaults to that containing the working directory, but can
5313
5154
be changed using --from.
5315
Both the submit branch and the public branch follow the usual behavior with
5316
respect to --remember: If there is no default location set, the first send
5317
will set it (use --no-remember to avoid settting it). After that, you can
5318
omit the location to use the default. To change the default, use
5319
--remember. The value will only be saved if the location can be accessed.
5321
5156
In order to calculate those changes, bzr must analyse the submit branch.
5322
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5323
5158
If a public location is known for the submit_branch, that location is used
5394
5229
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5395
no_patch=False, revision=None, remember=None, output=None,
5230
no_patch=False, revision=None, remember=False, output=None,
5396
5231
format=None, mail_to=None, message=None, body=None,
5397
5232
strict=None, **kwargs):
5398
5233
from bzrlib.send import send
5554
5393
_see_also = ['tag']
5555
5394
takes_options = [
5556
custom_help('directory',
5557
help='Branch whose tags should be displayed.'),
5558
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5559
5401
'Sort tags by different criteria.', title='Sorting',
5560
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5566
5409
@display_command
5567
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5568
from bzrlib.tag import tag_sort_methods
5569
5416
branch, relpath = Branch.open_containing(directory)
5571
5418
tags = branch.tags.get_tag_dict().items()
5575
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5577
5425
graph = branch.repository.get_graph()
5578
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5580
5428
# only show revisions between revid1 and revid2 (inclusive)
5581
5429
tags = [(tag, revid) for tag, revid in tags if
5582
5430
graph.is_between(revid, revid1, revid2)]
5584
sort = tag_sort_methods.get()
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]])
5586
5444
if not show_ids:
5587
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5588
5446
for index, (tag, revid) in enumerate(tags):
5727
5584
def run(self, to_location=None, force=False, create_branch=False,
5728
revision=None, directory=u'.'):
5729
5586
from bzrlib import switch
5730
tree_location = directory
5731
5588
revision = _get_one_revision('switch', revision)
5732
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5733
5590
if to_location is None:
5734
5591
if revision is None:
5735
5592
raise errors.BzrCommandError('You must supply either a'
5736
5593
' revision or a location')
5737
to_location = tree_location
5739
5596
branch = control_dir.open_branch()
5740
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6012
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
6013
5869
restore the most recently shelved changes.
6015
For complicated changes, it is possible to edit the changes in a separate
6016
editor program to decide what the file remaining in the working copy
6017
should look like. To do this, add the configuration option
6019
change_editor = PROGRAM @new_path @old_path
6021
where @new_path is replaced with the path of the new version of the
6022
file and @old_path is replaced with the path of the old version of
6023
the file. The PROGRAM should save the new file with the desired
6024
contents of the file in the working tree.
6028
5872
takes_args = ['file*']
6030
5874
takes_options = [
6033
5876
Option('all', help='Shelve all changes.'),
6040
5883
Option('destroy',
6041
5884
help='Destroy removed changes instead of shelving them.'),
6043
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6045
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6046
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6048
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6049
5892
from bzrlib.shelf_ui import Shelver
6050
5893
if writer is None:
6051
5894
writer = bzrlib.option.diff_writer_registry.get()
6053
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6054
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6126
5967
To check what clean-tree will do, use --dry-run.
6128
takes_options = ['directory',
6129
Option('ignored', help='Delete all ignored files.'),
6130
Option('detritus', help='Delete conflict files, merge and revert'
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6131
5971
' backups, and failed selftest dirs.'),
6132
5972
Option('unknown',
6133
5973
help='Delete files unknown to bzr (default).'),
6135
5975
' deleting them.'),
6136
5976
Option('force', help='Do not prompt before deleting.')]
6137
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6138
force=False, directory=u'.'):
6139
5979
from bzrlib.clean_tree import clean_tree
6140
5980
if not (unknown or ignored or detritus):
6144
clean_tree(directory, unknown=unknown, ignored=ignored,
6145
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6148
5988
class cmd_reference(Command):
6192
6032
self.outf.write('%s %s\n' % (path, location))
6195
class cmd_export_pot(Command):
6196
__doc__ = """Export command helps and error messages in po format."""
6201
from bzrlib.export_pot import export_pot
6202
export_pot(self.outf)
6205
6035
def _register_lazy_builtins():
6206
6036
# register lazy builtins from other modules; called at startup and should
6207
6037
# be only called once.
6208
6038
for (name, aliases, module_name) in [
6209
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6210
('cmd_config', [], 'bzrlib.config'),
6211
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6212
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6213
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6214
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6215
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6216
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6218
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
