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
852
if len(names_list) < 2:
834
853
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)
854
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
855
self.add_cleanup(tree.lock_tree_write().unlock)
838
856
self._run(tree, names_list, rel_names, after)
840
858
def run_auto(self, names_list, after, dry_run):
845
863
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)
865
work_tree, file_list = WorkingTree.open_containing_paths(
866
names_list, default_directory='.')
867
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
868
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
870
def _run(self, tree, names_list, rel_names, after):
946
964
match the remote one, use pull --overwrite. This will work even if the two
947
965
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.
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.
954
972
Note: The location can be specified either in the form of a branch,
955
973
or in the form of a path to a file containing a merge directive generated
960
978
takes_options = ['remember', 'overwrite', 'revision',
961
979
custom_help('verbose',
962
980
help='Show logs of pulled revisions.'),
981
custom_help('directory',
964
982
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
983
'rather than the one containing the working directory.'),
970
985
help="Perform a local pull in a bound "
971
986
"branch. Local pulls are not applied to "
972
987
"the master branch."
990
help="Show base revision text in conflicts.")
975
992
takes_args = ['location?']
976
993
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
995
def run(self, location=None, remember=None, overwrite=False,
979
996
revision=None, verbose=False,
980
directory=None, local=False):
997
directory=None, local=False,
981
999
# FIXME: too much stuff is in the command class
982
1000
revision_id = None
983
1001
mergeable = None
987
1005
tree_to = WorkingTree.open_containing(directory)[0]
988
1006
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
1007
self.add_cleanup(tree_to.lock_write().unlock)
991
1008
except errors.NoWorkingTree:
993
1010
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
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.")
997
1016
if local and not branch_to.get_bound_location():
998
1017
raise errors.LocalRequiresBoundBranch()
1077
1101
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1102
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.
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.
1086
1110
_see_also = ['pull', 'update', 'working-trees']
1088
1112
Option('create-prefix',
1089
1113
help='Create the path leading up to the branch '
1090
1114
'if it does not already exist.'),
1115
custom_help('directory',
1092
1116
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1117
'rather than the one containing the working directory.'),
1097
1118
Option('use-existing-dir',
1098
1119
help='By default push will fail if the target'
1099
1120
' directory exists, but does not already'
1110
1131
Option('strict',
1111
1132
help='Refuse to push if there are uncommitted changes in'
1112
1133
' the working tree, --no-strict disables the check.'),
1135
help="Don't populate the working tree, even for protocols"
1136
" that support it."),
1114
1138
takes_args = ['location?']
1115
1139
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1141
def run(self, location=None, remember=None, overwrite=False,
1118
1142
create_prefix=False, verbose=False, revision=None,
1119
1143
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1144
stacked=False, strict=None, no_tree=False):
1121
1145
from bzrlib.push import _show_push_branch
1123
1147
if directory is None:
1169
1193
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1194
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1195
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1196
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1199
class cmd_branch(Command):
1185
1209
To retrieve the branch as of a particular revision, supply the --revision
1186
1210
parameter, as in "branch foo/bar -r 5".
1212
The synonyms 'clone' and 'get' for this command are deprecated.
1189
1215
_see_also = ['checkout']
1190
1216
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
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."),
1193
1221
Option('no-tree',
1194
1222
help="Create a branch without a working-tree."),
1195
1223
Option('switch',
1214
1242
def run(self, from_location, to_location=None, revision=None,
1215
1243
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1244
use_existing_dir=False, switch=False, bind=False,
1217
1246
from bzrlib import switch as _mod_switch
1218
1247
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')
1219
1254
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)
1221
1263
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1264
self.add_cleanup(br_from.lock_read().unlock)
1224
1265
if revision is not None:
1225
1266
revision_id = revision.as_revision_id(br_from)
1331
1372
to_location = branch_location
1332
1373
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1374
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
1334
1380
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1381
if files_from is not None and files_from != branch_location:
1336
1382
accelerator_tree = WorkingTree.open(files_from)
1337
1383
if revision is not None:
1338
1384
revision_id = revision.as_revision_id(source)
1396
1440
If you want to discard your local changes, you can just do a
1397
1441
'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'.
1399
1446
If the tree's branch is bound to a master branch, it will also update
1400
1447
the branch from the master.
1403
1450
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1451
takes_args = ['dir?']
1405
takes_options = ['revision']
1452
takes_options = ['revision',
1454
help="Show base revision text in conflicts."),
1406
1456
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1458
def run(self, dir='.', revision=None, show_base=None):
1409
1459
if revision is not None and len(revision) != 1:
1410
1460
raise errors.BzrCommandError(
1411
1461
"bzr update --revision takes exactly one revision")
1519
1570
class cmd_remove(Command):
1520
1571
__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.
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.
1527
1579
takes_args = ['file*']
1528
1580
takes_options = ['verbose',
1530
1582
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1583
'The file deletion mode to be used.',
1532
1584
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1585
safe='Backup changed files (default).',
1535
1586
keep='Delete from bzr but leave the working copy.',
1587
no_backup='Don\'t backup changed files.',
1536
1588
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1589
'recovered and even if they are non-empty directories. '
1590
'(deprecated, use no-backup)')]
1538
1591
aliases = ['rm', 'del']
1539
1592
encoding_type = 'replace'
1541
1594
def run(self, file_list, verbose=False, new=False,
1542
1595
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
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)
1545
1603
if file_list is not None:
1546
1604
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1606
self.add_cleanup(tree.lock_write().unlock)
1550
1607
# Heuristics should probably all move into tree.remove_smart or
1636
1693
_see_also = ['check']
1637
1694
takes_args = ['branch?']
1696
Option('canonicalize-chks',
1697
help='Make sure CHKs are in canonical form (repairs '
1639
def run(self, branch="."):
1702
def run(self, branch=".", canonicalize_chks=False):
1640
1703
from bzrlib.reconcile import reconcile
1641
1704
dir = bzrdir.BzrDir.open(branch)
1705
reconcile(dir, canonicalize_chks=canonicalize_chks)
1645
1708
class cmd_revision_history(Command):
1723
1786
Option('append-revisions-only',
1724
1787
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1788
' Append revisions to it only.'),
1790
'Create a branch without a working tree.')
1727
1792
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1793
create_prefix=False, no_tree=False):
1729
1794
if format is None:
1730
1795
format = bzrdir.format_registry.make_bzrdir('default')
1731
1796
if location is None:
1985
2073
old_branch, new_branch,
1986
2074
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2075
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()
1988
2078
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2079
specific_files=specific_files,
1990
2080
external_diff_options=diff_options,
1991
2081
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2082
extra_trees=extra_trees,
2083
path_encoding=path_encoding,
1993
2085
format_cls=format)
2003
2095
# level of effort but possibly much less IO. (Or possibly not,
2004
2096
# if the directories are very large...)
2005
2097
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2098
takes_options = ['directory', 'show-ids']
2008
2100
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2101
def run(self, show_ids=False, directory=u'.'):
2102
tree = WorkingTree.open_containing(directory)[0]
2103
self.add_cleanup(tree.lock_read().unlock)
2013
2104
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2105
self.add_cleanup(old.lock_read().unlock)
2016
2106
for path, ie in old.inventory.iter_entries():
2017
2107
if not tree.has_id(ie.file_id):
2018
2108
self.outf.write(path)
2030
2120
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2121
takes_options = ['directory', 'null']
2037
2123
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2124
def run(self, null=False, directory=u'.'):
2125
tree = WorkingTree.open_containing(directory)[0]
2126
self.add_cleanup(tree.lock_read().unlock)
2040
2127
td = tree.changes_from(tree.basis_tree())
2041
2129
for path, id, kind, text_modified, meta_modified in td.modified:
2043
2131
self.outf.write(path + '\0')
2053
2141
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2142
takes_options = ['directory', 'null']
2060
2144
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2145
def run(self, null=False, directory=u'.'):
2146
wt = WorkingTree.open_containing(directory)[0]
2147
self.add_cleanup(wt.lock_read().unlock)
2065
2148
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2149
self.add_cleanup(basis.lock_read().unlock)
2068
2150
basis_inv = basis.inventory
2069
2151
inv = wt.inventory
2070
2152
for file_id in inv:
2528
2614
help='Recurse into subdirectories.'),
2529
2615
Option('from-root',
2530
2616
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2617
Option('unknown', short_name='u',
2618
help='Print unknown files.'),
2532
2619
Option('versioned', help='Print versioned files.',
2533
2620
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.'),
2621
Option('ignored', short_name='i',
2622
help='Print ignored files.'),
2623
Option('kind', short_name='k',
2539
2624
help='List entries of a particular kind: file, directory, symlink.',
2543
2630
@display_command
2544
2631
def run(self, revision=None, verbose=False,
2545
2632
recursive=False, from_root=False,
2546
2633
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2634
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2636
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2637
raise errors.BzrCommandError('invalid kind specified')
2713
2809
_see_also = ['status', 'ignored', 'patterns']
2714
2810
takes_args = ['name_pattern*']
2811
takes_options = ['directory',
2716
2812
Option('default-rules',
2717
2813
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2816
def run(self, name_pattern_list=None, default_rules=None,
2721
2818
from bzrlib import ignores
2722
2819
if default_rules is not None:
2723
2820
# dump the default rules and exit
2729
2826
"NAME_PATTERN or --default-rules.")
2730
2827
name_pattern_list = [globbing.normalize_pattern(p)
2731
2828
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('')
2732
2837
for name_pattern in name_pattern_list:
2733
2838
if (name_pattern[0] == '/' or
2734
2839
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2840
raise errors.BzrCommandError(
2736
2841
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2842
tree, relpath = WorkingTree.open_containing(directory)
2738
2843
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2844
ignored = globbing.Globster(name_pattern_list)
2846
self.add_cleanup(tree.lock_read().unlock)
2742
2847
for entry in tree.list_files():
2744
2849
if id is not None:
2745
2850
filename = entry[0]
2746
2851
if ignored.match(filename):
2747
2852
matches.append(filename)
2749
2853
if len(matches) > 0:
2750
2854
self.outf.write("Warning: the following files are version controlled and"
2751
2855
" match your ignore pattern:\n%s"
2767
2871
encoding_type = 'replace'
2768
2872
_see_also = ['ignore', 'ls']
2873
takes_options = ['directory']
2770
2875
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2876
def run(self, directory=u'.'):
2877
tree = WorkingTree.open_containing(directory)[0]
2878
self.add_cleanup(tree.lock_read().unlock)
2775
2879
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2880
if file_class != 'I':
2844
2950
'revision in which it was changed.'),
2846
2952
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2953
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2954
from bzrlib.export import export
2850
2956
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2957
tree = WorkingTree.open_containing(directory)[0]
2852
2958
b = tree.branch
2885
2991
@display_command
2886
2992
def run(self, filename, revision=None, name_from_revision=False,
2993
filters=False, directory=None):
2888
2994
if revision is not None and len(revision) != 1:
2889
2995
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2996
" one revision specifier")
2891
2997
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2998
_open_directory_or_containing_tree_or_branch(filename, directory)
2999
self.add_cleanup(branch.lock_read().unlock)
2895
3000
return self._run(tree, branch, relpath, filename, revision,
2896
3001
name_from_revision, filters)
3013
3117
to trigger updates to external systems like bug trackers. The --fixes
3014
3118
option can be used to record the association between a revision and
3015
3119
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
3122
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3123
takes_args = ['selected*']
3101
3184
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3185
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3186
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3188
from bzrlib.errors import (
3105
3189
PointlessCommit,
3106
3190
ConflictsInTree,
3120
3204
raise errors.BzrCommandError(
3121
3205
"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
3207
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3209
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3210
if selected_list == ['']:
3133
3211
# workaround - commit of root of tree should be exactly the same
3134
3212
# as just default commit in that tree, and succeed even though
3205
3286
reporter=None, verbose=verbose, revprops=properties,
3206
3287
authors=author, timestamp=commit_stamp,
3207
3288
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3289
exclude=tree.safe_relpath_files(exclude),
3209
3291
except PointlessCommit:
3210
3292
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3293
" Please 'bzr add' the files you want to commit, or use"
3294
" --unchanged to force an empty commit.")
3212
3295
except ConflictsInTree:
3213
3296
raise errors.BzrCommandError('Conflicts detected in working '
3214
3297
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3297
3380
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.
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/.
3305
_see_also = ['check']
3413
_see_also = ['check', 'reconcile', 'formats']
3306
3414
takes_args = ['url?']
3307
3415
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'),
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."),
3316
def run(self, url='.', format=None):
3428
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3429
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3430
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3432
if len(exceptions) == 1:
3433
# Compatibility with historical behavior
3321
3439
class cmd_whoami(Command):
3340
3459
encoding_type = 'replace'
3342
3461
@display_command
3343
def run(self, email=False, branch=False, name=None):
3462
def run(self, email=False, branch=False, name=None, directory=None):
3344
3463
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()
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()
3351
3473
self.outf.write(c.user_email() + '\n')
3353
3475
self.outf.write(c.username() + '\n')
3479
raise errors.BzrCommandError("--email can only be used to display existing "
3356
3482
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3484
_mod_config.extract_email_address(name)
3359
3485
except errors.NoEmailInUsername, e:
3360
3486
warning('"%s" does not seem to contain an email address. '
3361
3487
'This is allowed, but not recommended.', name)
3363
3489
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3491
if directory is None:
3492
c = Branch.open_containing(u'.')[0].get_config()
3494
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3496
c = _mod_config.GlobalConfig()
3368
3497
c.set_user_option('email', name)
3436
3566
'bzr alias --remove expects an alias to remove.')
3437
3567
# If alias is not found, print something like:
3438
3568
# unalias: foo: not found
3439
c = config.GlobalConfig()
3569
c = _mod_config.GlobalConfig()
3440
3570
c.unset_alias(alias_name)
3442
3572
@display_command
3443
3573
def print_aliases(self):
3444
3574
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3575
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3576
for key, value in sorted(aliases.iteritems()):
3447
3577
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3515
3648
if typestring == "sftp":
3516
3649
from bzrlib.tests import stub_sftp
3517
3650
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3651
elif typestring == "memory":
3519
3652
from bzrlib.tests import test_server
3520
3653
return memory.MemoryServer
3521
if typestring == "fakenfs":
3654
elif typestring == "fakenfs":
3522
3655
from bzrlib.tests import test_server
3523
3656
return test_server.FakeNFSServer
3524
3657
msg = "No known transport type %s. Supported types are: sftp\n" %\
3537
3670
'throughout the test suite.',
3538
3671
type=get_transport_type),
3539
3672
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3673
help='Run the benchmarks rather than selftests.',
3541
3675
Option('lsprof-timed',
3542
3676
help='Generate lsprof output for benchmarked'
3543
3677
' sections of code.'),
3544
3678
Option('lsprof-tests',
3545
3679
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3680
Option('first',
3550
3681
help='Run all tests, but run specified tests first.',
3551
3682
short_name='f',
3560
3691
Option('randomize', type=str, argname="SEED",
3561
3692
help='Randomize the order of tests using the given'
3562
3693
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3694
ListOption('exclude', type=str, argname="PATTERN",
3696
help='Exclude tests that match this regular'
3567
3698
Option('subunit',
3568
3699
help='Output test progress via subunit.'),
3569
3700
Option('strict', help='Fail on missing dependencies or '
3586
3717
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3718
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3720
first=False, list_only=False,
3590
3721
randomize=None, exclude=None, strict=False,
3591
3722
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
3723
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)
3724
from bzrlib import tests
3602
3726
if testspecs_list is not None:
3603
3727
pattern = '|'.join(testspecs_list)
3612
3736
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3737
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3738
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
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):
3617
3745
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3747
self.additional_selftest_args.setdefault(
3620
3748
'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)
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
3629
test_suite_factory = None
3757
exclude_pattern = '(' + '|'.join(exclude) + ')'
3631
3758
selftest_kwargs = {"verbose": verbose,
3632
3759
"pattern": pattern,
3633
3760
"stop_on_failure": one,
3635
3762
"test_suite_factory": test_suite_factory,
3636
3763
"lsprof_timed": lsprof_timed,
3637
3764
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3765
"matching_tests_first": first,
3640
3766
"list_only": list_only,
3641
3767
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3768
"exclude_pattern": exclude_pattern,
3643
3769
"strict": strict,
3644
3770
"load_list": load_list,
3645
3771
"debug_flags": debugflag,
3646
3772
"starting_with": starting_with
3648
3774
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3776
# Make deprecation warnings visible, unless -Werror is set
3777
cleanup = symbol_versioning.activate_deprecation_warnings(
3780
result = tests.selftest(**selftest_kwargs)
3650
3783
return int(not result)
3709
3840
The source of the merge can be specified either in the form of a branch,
3710
3841
or in the form of a path to a file containing a merge directive generated
3711
3842
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.
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.
3725
3865
Merge will do its best to combine the changes in two branches, but there
3726
3866
are some kinds of problems only a human can fix. When it encounters those,
3730
3870
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.
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.
3737
3877
The results of the merge are placed into the destination working
3738
3878
directory, where they can be reviewed (with bzr diff), tested, and then
3793
3933
' completely merged into the source, pull from the'
3794
3934
' source rather than merging. When this happens,'
3795
3935
' you do not need to commit the result.'),
3936
custom_help('directory',
3797
3937
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3938
'rather than the one containing the working directory.'),
3802
3939
Option('preview', help='Instead of merging, show a diff of the'
3804
3941
Option('interactive', help='Select changes interactively.',
3808
3945
def run(self, location=None, revision=None, force=False,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
3946
merge_type=None, show_base=False, reprocess=None, remember=None,
3810
3947
uncommitted=False, pull=False,
3811
3948
directory=None,
3873
4013
self.sanity_check_merger(merger)
3874
4014
if (merger.base_rev_id == merger.other_rev_id and
3875
4015
merger.other_rev_id is not None):
4016
# check if location is a nonexistent file (and not a branch) to
4017
# disambiguate the 'Nothing to do'
4018
if merger.interesting_files:
4019
if not merger.other_tree.has_filename(
4020
merger.interesting_files[0]):
4021
note("merger: " + str(merger))
4022
raise errors.PathsDoNotExist([location])
3876
4023
note('Nothing to do.')
4025
if pull and not preview:
3879
4026
if merger.interesting_files is not None:
3880
4027
raise errors.BzrCommandError('Cannot pull individual files')
3881
4028
if (merger.base_rev_id == tree.last_revision()):
3905
4052
def _do_preview(self, merger):
3906
4053
from bzrlib.diff import show_diff_trees
3907
4054
result_tree = self._get_preview(merger)
4055
path_encoding = osutils.get_diff_header_encoding()
3908
4056
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
4057
old_label='', new_label='',
4058
path_encoding=path_encoding)
3911
4060
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
4061
merger.change_reporter = change_reporter
3988
4137
if other_revision_id is None:
3989
4138
other_revision_id = _mod_revision.ensure_null(
3990
4139
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):
4140
# Remember where we merge from. We need to remember if:
4141
# - user specify a location (and we don't merge from the parent
4143
# - user ask to remember or there is no previous location set to merge
4144
# from and user didn't ask to *not* remember
4145
if (user_location is not None
4147
or (remember is None
4148
and tree.branch.get_submit_branch() is None)))):
3994
4149
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4150
# Merge tags (but don't set them in the master branch yet, the user
4151
# might revert this merge). Commit will propagate them.
4152
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4153
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4154
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4155
if other_path != '':
4167
4323
last committed revision is used.
4169
4325
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.
4326
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4327
will remove the changes introduced by the second last commit (-2), without
4328
affecting the changes introduced by the last commit (-1). To remove
4329
certain changes on a hunk-by-hunk basis, see the shelve command.
4174
4331
By default, any files that have been manually changed will be backed up
4175
4332
first. (Files changed only by merge are not backed up.) Backup files have
4340
4497
theirs_only=False,
4341
4498
log_format=None, long=False, short=False, line=False,
4342
4499
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4500
include_merges=False, revision=None, my_revision=None,
4344
4502
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4503
def message(s):
4346
4504
if not is_quiet():
4507
4662
@display_command
4508
4663
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")
4664
from bzrlib import plugin
4665
# Don't give writelines a generator as some codecs don't like that
4666
self.outf.writelines(
4667
list(plugin.describe_plugins(show_paths=verbose)))
4531
4670
class cmd_testament(Command):
4578
4716
Option('long', help='Show commit date in annotations.'),
4582
4721
encoding_type = 'exact'
4584
4723
@display_command
4585
4724
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4725
show_ids=False, directory=None):
4726
from bzrlib.annotate import (
4588
4729
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4730
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4731
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4732
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4734
self.add_cleanup(branch.lock_read().unlock)
4596
4735
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4736
self.add_cleanup(tree.lock_read().unlock)
4737
if wt is not None and revision is None:
4600
4738
file_id = wt.path2id(relpath)
4602
4740
file_id = tree.path2id(relpath)
4603
4741
if file_id is None:
4604
4742
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4743
if wt is not None and revision is None:
4607
4744
# If there is a tree and we're not annotating historical
4608
4745
# versions, annotate the working tree's content.
4609
4746
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4747
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4749
annotate_file_tree(tree, file_id, self.outf, long, all,
4750
show_ids=show_ids, branch=branch)
4616
4753
class cmd_re_sign(Command):
4620
4757
hidden = True # is this right ?
4621
4758
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4759
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4761
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4762
if revision_id_list is not None and revision is not None:
4626
4763
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4764
if revision_id_list is None and revision is None:
4628
4765
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)
4766
b = WorkingTree.open_containing(directory)[0].branch
4767
self.add_cleanup(b.lock_write().unlock)
4632
4768
return self._run(b, revision_id_list, revision)
4634
4770
def _run(self, b, revision_id_list, revision):
4694
4830
_see_also = ['checkouts', 'unbind']
4695
4831
takes_args = ['location?']
4832
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4834
def run(self, location=None, directory=u'.'):
4835
b, relpath = Branch.open_containing(directory)
4700
4836
if location is None:
4702
4838
location = b.get_old_bound_location()
4784
4920
b = control.open_branch()
4786
4922
if tree is not None:
4788
self.add_cleanup(tree.unlock)
4923
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4925
self.add_cleanup(b.lock_write().unlock)
4792
4926
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4794
4928
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4859
4999
bzr break-lock bzr+ssh://example.com/bzr/foo
5000
bzr break-lock --conf ~/.bazaar
4861
5003
takes_args = ['location?']
5006
help='LOCATION is the directory where the config lock is.'),
5008
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5011
def run(self, location=None, config=False, force=False):
4864
5012
if location is None:
4865
5013
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5015
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5017
{'bzrlib.lockdir.break': True})
5019
conf = _mod_config.LockableConfig(file_name=location)
5022
control, relpath = bzrdir.BzrDir.open_containing(location)
5024
control.break_lock()
5025
except NotImplementedError:
4873
5029
class cmd_wait_until_signalled(Command):
4938
5093
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
5094
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
5095
from bzrlib import transport
4941
5096
if directory is None:
4942
5097
directory = os.getcwd()
4943
5098
if protocol is None:
4944
protocol = transport_server_registry.get()
5099
protocol = transport.transport_server_registry.get()
4945
5100
host, port = self.get_host_and_port(port)
4946
5101
url = urlutils.local_path_to_url(directory)
4947
5102
if not allow_writes:
4948
5103
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5104
t = transport.get_transport(url)
5105
protocol(t, host, port, inet)
4953
5108
class cmd_join(Command):
5064
5220
encoding_type = 'exact'
5066
5222
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5223
sign=False, revision=None, mail_to=None, message=None,
5068
5225
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5226
include_patch, include_bundle = {
5070
5227
'plain': (False, False),
5071
5228
'diff': (True, False),
5072
5229
'bundle': (True, True),
5074
branch = Branch.open('.')
5231
branch = Branch.open(directory)
5075
5232
stored_submit_branch = branch.get_submit_branch()
5076
5233
if submit_branch is None:
5077
5234
submit_branch = stored_submit_branch
5153
5310
source branch defaults to that containing the working directory, but can
5154
5311
be changed using --from.
5313
Both the submit branch and the public branch follow the usual behavior with
5314
respect to --remember: If there is no default location set, the first send
5315
will set it (use --no-remember to avoid settting it). After that, you can
5316
omit the location to use the default. To change the default, use
5317
--remember. The value will only be saved if the location can be accessed.
5156
5319
In order to calculate those changes, bzr must analyse the submit branch.
5157
5320
Therefore it is most efficient for the submit branch to be a local mirror.
5158
5321
If a public location is known for the submit_branch, that location is used
5229
5392
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5393
no_patch=False, revision=None, remember=None, output=None,
5231
5394
format=None, mail_to=None, message=None, body=None,
5232
5395
strict=None, **kwargs):
5233
5396
from bzrlib.send import send
5393
5552
_see_also = ['tag']
5394
5553
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5554
custom_help('directory',
5555
help='Branch whose tags should be displayed.'),
5556
RegistryOption('sort',
5401
5557
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5558
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5564
@display_command
5565
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5566
from bzrlib.tag import tag_sort_methods
5416
5567
branch, relpath = Branch.open_containing(directory)
5418
5569
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5573
self.add_cleanup(branch.lock_read().unlock)
5425
5575
graph = branch.repository.get_graph()
5426
5576
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5428
5578
# only show revisions between revid1 and revid2 (inclusive)
5429
5579
tags = [(tag, revid) for tag, revid in tags if
5430
5580
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]])
5582
sort = tag_sort_methods.get()
5444
5584
if not show_ids:
5445
5585
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5586
for index, (tag, revid) in enumerate(tags):
5584
5725
def run(self, to_location=None, force=False, create_branch=False,
5726
revision=None, directory=u'.'):
5586
5727
from bzrlib import switch
5728
tree_location = directory
5588
5729
revision = _get_one_revision('switch', revision)
5589
5730
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5731
if to_location is None:
5591
5732
if revision is None:
5592
5733
raise errors.BzrCommandError('You must supply either a'
5593
5734
' revision or a location')
5735
to_location = tree_location
5596
5737
branch = control_dir.open_branch()
5597
5738
had_explicit_nick = branch.get_config().has_explicit_nickname()
5868
6010
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6011
restore the most recently shelved changes.
6013
For complicated changes, it is possible to edit the changes in a separate
6014
editor program to decide what the file remaining in the working copy
6015
should look like. To do this, add the configuration option
6017
change_editor = PROGRAM @new_path @old_path
6019
where @new_path is replaced with the path of the new version of the
6020
file and @old_path is replaced with the path of the old version of
6021
the file. The PROGRAM should save the new file with the desired
6022
contents of the file in the working tree.
5872
6026
takes_args = ['file*']
5874
6028
takes_options = [
5876
6031
Option('all', help='Shelve all changes.'),
5883
6038
Option('destroy',
5884
6039
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6041
_see_also = ['unshelve', 'configuration']
5888
6043
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6044
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6046
return self.run_for_list(directory=directory)
5892
6047
from bzrlib.shelf_ui import Shelver
5893
6048
if writer is None:
5894
6049
writer = bzrlib.option.diff_writer_registry.get()
5896
6051
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6052
file_list, message, destroy=destroy, directory=directory)
5967
6124
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'
6126
takes_options = ['directory',
6127
Option('ignored', help='Delete all ignored files.'),
6128
Option('detritus', help='Delete conflict files, merge and revert'
5971
6129
' backups, and failed selftest dirs.'),
5972
6130
Option('unknown',
5973
6131
help='Delete files unknown to bzr (default).'),
5975
6133
' deleting them.'),
5976
6134
Option('force', help='Do not prompt before deleting.')]
5977
6135
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6136
force=False, directory=u'.'):
5979
6137
from bzrlib.clean_tree import clean_tree
5980
6138
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6142
clean_tree(directory, unknown=unknown, ignored=ignored,
6143
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6146
class cmd_reference(Command):
6032
6190
self.outf.write('%s %s\n' % (path, location))
6193
class cmd_export_pot(Command):
6194
__doc__ = """Export command helps and error messages in po format."""
6199
from bzrlib.export_pot import export_pot
6200
export_pot(self.outf)
6035
6203
def _register_lazy_builtins():
6036
6204
# register lazy builtins from other modules; called at startup and should
6037
6205
# be only called once.
6038
6206
for (name, aliases, module_name) in [
6039
6207
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6208
('cmd_config', [], 'bzrlib.config'),
6040
6209
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6210
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6211
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6212
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
6213
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6214
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6216
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
