75
74
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
77
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
78
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]))
80
return internal_tree_files(file_list, default_branch, canonicalize,
88
84
def tree_files_for_add(file_list):
153
149
# XXX: Bad function name; should possibly also be a class method of
154
150
# WorkingTree rather than a function.
151
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
152
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
153
apply_view=True):
157
154
"""Convert command-line paths to a WorkingTree and relative paths.
156
Deprecated: use WorkingTree.open_containing_paths instead.
159
158
This is typically used for command-line processors that take one or
160
159
more filenames, and infer the workingtree that contains them.
172
171
: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)
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
223
179
def _get_view_info_for_change_reporter(tree):
294
250
To skip the display of pending merge information altogether, use
295
251
the no-pending option or specify a file/directory.
297
If a revision argument is given, the status is calculated against
298
that revision, or between two revisions if two are provided.
253
To compare the working directory to a specific revision, pass a
254
single revision to the revision argument.
256
To see which files have changed in a specific revision, or between
257
two revisions, pass a revision range to the revision argument.
258
This will produce the same results as calling 'bzr diff --summarize'.
301
261
# TODO: --no-recurse, --recurse options
519
485
d.destroy_workingtree()
488
class cmd_repair_workingtree(Command):
489
__doc__ = """Reset the working tree state file.
491
This is not meant to be used normally, but more as a way to recover from
492
filesystem corruption, etc. This rebuilds the working inventory back to a
493
'known good' state. Any new modifications (adding a file, renaming, etc)
494
will be lost, though modified files will still be detected as such.
496
Most users will want something more like "bzr revert" or "bzr update"
497
unless the state file has become corrupted.
499
By default this attempts to recover the current state by looking at the
500
headers of the state file. If the state file is too corrupted to even do
501
that, you can supply --revision to force the state of the tree.
504
takes_options = ['revision', 'directory',
506
help='Reset the tree even if it doesn\'t appear to be'
511
def run(self, revision=None, directory='.', force=False):
512
tree, _ = WorkingTree.open_containing(directory)
513
self.add_cleanup(tree.lock_tree_write().unlock)
517
except errors.BzrError:
518
pass # There seems to be a real error here, so we'll reset
521
raise errors.BzrCommandError(
522
'The tree does not appear to be corrupt. You probably'
523
' want "bzr revert" instead. Use "--force" if you are'
524
' sure you want to reset the working tree.')
528
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
530
tree.reset_state(revision_ids)
531
except errors.BzrError, e:
532
if revision_ids is None:
533
extra = (', the header appears corrupt, try passing -r -1'
534
' to set the state to the last commit')
537
raise errors.BzrCommandError('failed to reset the tree state'
522
541
class cmd_revno(Command):
523
542
__doc__ = """Show current revision number.
964
984
"branch. Local pulls are not applied to "
965
985
"the master branch."
988
help="Show base revision text in conflicts.")
968
990
takes_args = ['location?']
969
991
encoding_type = 'replace'
971
993
def run(self, location=None, remember=False, overwrite=False,
972
994
revision=None, verbose=False,
973
directory=None, local=False):
995
directory=None, local=False,
974
997
# FIXME: too much stuff is in the command class
975
998
revision_id = None
1104
1138
def run(self, location=None, remember=False, overwrite=False,
1105
1139
create_prefix=False, verbose=False, revision=None,
1106
1140
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1141
stacked=False, strict=None, no_tree=False):
1108
1142
from bzrlib.push import _show_push_branch
1110
1144
if directory is None:
1156
1190
_show_push_branch(br_from, revision_id, location, self.outf,
1157
1191
verbose=verbose, overwrite=overwrite, remember=remember,
1158
1192
stacked_on=stacked_on, create_prefix=create_prefix,
1159
use_existing_dir=use_existing_dir)
1193
use_existing_dir=use_existing_dir, no_tree=no_tree)
1162
1196
class cmd_branch(Command):
1172
1206
To retrieve the branch as of a particular revision, supply the --revision
1173
1207
parameter, as in "branch foo/bar -r 5".
1209
The synonyms 'clone' and 'get' for this command are deprecated.
1176
1212
_see_also = ['checkout']
1177
1213
takes_args = ['from_location', 'to_location?']
1178
takes_options = ['revision', Option('hardlink',
1179
help='Hard-link working tree files where possible.'),
1214
takes_options = ['revision',
1215
Option('hardlink', help='Hard-link working tree files where possible.'),
1216
Option('files-from', type=str,
1217
help="Get file contents from this tree."),
1180
1218
Option('no-tree',
1181
1219
help="Create a branch without a working-tree."),
1182
1220
Option('switch',
1201
1239
def run(self, from_location, to_location=None, revision=None,
1202
1240
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1241
use_existing_dir=False, switch=False, bind=False,
1204
1243
from bzrlib import switch as _mod_switch
1205
1244
from bzrlib.tag import _merge_tags_if_possible
1245
if self.invoked_as in ['get', 'clone']:
1246
ui.ui_factory.show_user_warning(
1247
'deprecated_command',
1248
deprecated_name=self.invoked_as,
1249
recommended_name='branch',
1250
deprecated_in_version='2.4')
1206
1251
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1253
if not (hardlink or files_from):
1254
# accelerator_tree is usually slower because you have to read N
1255
# files (no readahead, lots of seeks, etc), but allow the user to
1256
# explicitly request it
1257
accelerator_tree = None
1258
if files_from is not None and files_from != from_location:
1259
accelerator_tree = WorkingTree.open(files_from)
1208
1260
revision = _get_one_revision('branch', revision)
1209
1261
self.add_cleanup(br_from.lock_read().unlock)
1210
1262
if revision is not None:
1317
1369
to_location = branch_location
1318
1370
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1319
1371
branch_location)
1372
if not (hardlink or files_from):
1373
# accelerator_tree is usually slower because you have to read N
1374
# files (no readahead, lots of seeks, etc), but allow the user to
1375
# explicitly request it
1376
accelerator_tree = None
1320
1377
revision = _get_one_revision('checkout', revision)
1321
if files_from is not None:
1378
if files_from is not None and files_from != branch_location:
1322
1379
accelerator_tree = WorkingTree.open(files_from)
1323
1380
if revision is not None:
1324
1381
revision_id = revision.as_revision_id(source)
1385
1437
If you want to discard your local changes, you can just do a
1386
1438
'bzr revert' instead of 'bzr commit' after the update.
1440
If you want to restore a file that has been removed locally, use
1441
'bzr revert' instead of 'bzr update'.
1388
1443
If the tree's branch is bound to a master branch, it will also update
1389
1444
the branch from the master.
1392
1447
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1448
takes_args = ['dir?']
1394
takes_options = ['revision']
1449
takes_options = ['revision',
1451
help="Show base revision text in conflicts."),
1395
1453
aliases = ['up']
1397
def run(self, dir='.', revision=None):
1455
def run(self, dir='.', revision=None, show_base=None):
1398
1456
if revision is not None and len(revision) != 1:
1399
1457
raise errors.BzrCommandError(
1400
1458
"bzr update --revision takes exactly one revision")
1508
1567
class cmd_remove(Command):
1509
1568
__doc__ = """Remove files or directories.
1511
This makes bzr stop tracking changes to the specified files. bzr will delete
1512
them if they can easily be recovered using revert. If no options or
1513
parameters are given bzr will scan for files that are being tracked by bzr
1514
but missing in your tree and stop tracking them for you.
1570
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1571
delete them if they can easily be recovered using revert otherwise they
1572
will be backed up (adding an extention of the form .~#~). If no options or
1573
parameters are given Bazaar will scan for files that are being tracked by
1574
Bazaar but missing in your tree and stop tracking them for you.
1516
1576
takes_args = ['file*']
1517
1577
takes_options = ['verbose',
1519
1579
RegistryOption.from_kwargs('file-deletion-strategy',
1520
1580
'The file deletion mode to be used.',
1521
1581
title='Deletion Strategy', value_switches=True, enum_switch=False,
1522
safe='Only delete files if they can be'
1523
' safely recovered (default).',
1582
safe='Backup changed files (default).',
1524
1583
keep='Delete from bzr but leave the working copy.',
1584
no_backup='Don\'t backup changed files.',
1525
1585
force='Delete all the specified files, even if they can not be '
1526
'recovered and even if they are non-empty directories.')]
1586
'recovered and even if they are non-empty directories. '
1587
'(deprecated, use no-backup)')]
1527
1588
aliases = ['rm', 'del']
1528
1589
encoding_type = 'replace'
1530
1591
def run(self, file_list, verbose=False, new=False,
1531
1592
file_deletion_strategy='safe'):
1532
tree, file_list = tree_files(file_list)
1593
if file_deletion_strategy == 'force':
1594
note("(The --force option is deprecated, rather use --no-backup "
1596
file_deletion_strategy = 'no-backup'
1598
tree, file_list = WorkingTree.open_containing_paths(file_list)
1534
1600
if file_list is not None:
1535
1601
file_list = [f for f in file_list]
1624
1690
_see_also = ['check']
1625
1691
takes_args = ['branch?']
1693
Option('canonicalize-chks',
1694
help='Make sure CHKs are in canonical form (repairs '
1627
def run(self, branch="."):
1699
def run(self, branch=".", canonicalize_chks=False):
1628
1700
from bzrlib.reconcile import reconcile
1629
1701
dir = bzrdir.BzrDir.open(branch)
1702
reconcile(dir, canonicalize_chks=canonicalize_chks)
1633
1705
class cmd_revision_history(Command):
1711
1783
Option('append-revisions-only',
1712
1784
help='Never change revnos or the existing log.'
1713
' Append revisions to it only.')
1785
' Append revisions to it only.'),
1787
'Create a branch without a working tree.')
1715
1789
def run(self, location=None, format=None, append_revisions_only=False,
1716
create_prefix=False):
1790
create_prefix=False, no_tree=False):
1717
1791
if format is None:
1718
1792
format = bzrdir.format_registry.make_bzrdir('default')
1719
1793
if location is None:
1973
2070
old_branch, new_branch,
1974
2071
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
2072
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2073
# GNU diff on Windows uses ANSI encoding for filenames
2074
path_encoding = osutils.get_diff_header_encoding()
1976
2075
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
2076
specific_files=specific_files,
1978
2077
external_diff_options=diff_options,
1979
2078
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
2079
extra_trees=extra_trees,
2080
path_encoding=path_encoding,
1981
2082
format_cls=format)
2711
2823
"NAME_PATTERN or --default-rules.")
2712
2824
name_pattern_list = [globbing.normalize_pattern(p)
2713
2825
for p in name_pattern_list]
2827
for p in name_pattern_list:
2828
if not globbing.Globster.is_pattern_valid(p):
2829
bad_patterns += ('\n %s' % p)
2831
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2832
ui.ui_factory.show_error(msg)
2833
raise errors.InvalidPattern('')
2714
2834
for name_pattern in name_pattern_list:
2715
2835
if (name_pattern[0] == '/' or
2716
2836
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2994
3114
to trigger updates to external systems like bug trackers. The --fixes
2995
3115
option can be used to record the association between a revision and
2996
3116
one or more bugs. See ``bzr help bugs`` for details.
2998
A selective commit may fail in some cases where the committed
2999
tree would be invalid. Consider::
3004
bzr commit foo -m "committing foo"
3005
bzr mv foo/bar foo/baz
3008
bzr commit foo/bar -m "committing bar but not baz"
3010
In the example above, the last commit will fail by design. This gives
3011
the user the opportunity to decide whether they want to commit the
3012
rename at the same time, separately first, or not at all. (As a general
3013
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3015
# TODO: Run hooks on tree to-be-committed, and after commit.
3017
# TODO: Strict commit that fails if there are deleted files.
3018
# (what does "deleted files" mean ??)
3020
# TODO: Give better message for -s, --summary, used by tla people
3022
# XXX: verbose currently does nothing
3024
3119
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3025
3120
takes_args = ['selected*']
3101
3196
raise errors.BzrCommandError(
3102
3197
"Could not parse --commit-time: " + str(e))
3104
# TODO: Need a blackbox test for invoking the external editor; may be
3105
# slightly problematic to run this cross-platform.
3107
# TODO: do more checks that the commit will succeed before
3108
# spending the user's valuable time typing a commit message.
3110
3199
properties = {}
3112
tree, selected_list = tree_files(selected_list)
3201
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3113
3202
if selected_list == ['']:
3114
3203
# workaround - commit of root of tree should be exactly the same
3115
3204
# as just default commit in that tree, and succeed even though
3186
3278
reporter=None, verbose=verbose, revprops=properties,
3187
3279
authors=author, timestamp=commit_stamp,
3188
3280
timezone=offset,
3189
exclude=safe_relpath_files(tree, exclude))
3281
exclude=tree.safe_relpath_files(exclude))
3190
3282
except PointlessCommit:
3191
3283
raise errors.BzrCommandError("No changes to commit."
3192
" Use --unchanged to commit anyhow.")
3284
" Please 'bzr add' the files you want to commit, or use"
3285
" --unchanged to force an empty commit.")
3193
3286
except ConflictsInTree:
3194
3287
raise errors.BzrCommandError('Conflicts detected in working '
3195
3288
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3278
3371
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3281
The check command or bzr developers may sometimes advise you to run
3282
this command. When the default format has changed you may also be warned
3283
during other operations to upgrade.
3372
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3374
When the default format has changed after a major new release of
3375
Bazaar, you may be informed during certain operations that you
3376
should upgrade. Upgrading to a newer format may improve performance
3377
or make new features available. It may however limit interoperability
3378
with older repositories or with older versions of Bazaar.
3380
If you wish to upgrade to a particular format rather than the
3381
current default, that can be specified using the --format option.
3382
As a consequence, you can use the upgrade command this way to
3383
"downgrade" to an earlier format, though some conversions are
3384
a one way process (e.g. changing from the 1.x default to the
3385
2.x default) so downgrading is not always possible.
3387
A backup.bzr.~#~ directory is created at the start of the conversion
3388
process (where # is a number). By default, this is left there on
3389
completion. If the conversion fails, delete the new .bzr directory
3390
and rename this one back in its place. Use the --clean option to ask
3391
for the backup.bzr directory to be removed on successful conversion.
3392
Alternatively, you can delete it by hand if everything looks good
3395
If the location given is a shared repository, dependent branches
3396
are also converted provided the repository converts successfully.
3397
If the conversion of a branch fails, remaining branches are still
3400
For more information on upgrades, see the Bazaar Upgrade Guide,
3401
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3286
_see_also = ['check']
3404
_see_also = ['check', 'reconcile', 'formats']
3287
3405
takes_args = ['url?']
3288
3406
takes_options = [
3289
RegistryOption('format',
3290
help='Upgrade to a specific format. See "bzr help'
3291
' formats" for details.',
3292
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3293
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3294
value_switches=True, title='Branch format'),
3407
RegistryOption('format',
3408
help='Upgrade to a specific format. See "bzr help'
3409
' formats" for details.',
3410
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3411
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3412
value_switches=True, title='Branch format'),
3414
help='Remove the backup.bzr directory if successful.'),
3416
help="Show what would be done, but don't actually do anything."),
3297
def run(self, url='.', format=None):
3419
def run(self, url='.', format=None, clean=False, dry_run=False):
3298
3420
from bzrlib.upgrade import upgrade
3299
upgrade(url, format)
3421
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3423
if len(exceptions) == 1:
3424
# Compatibility with historical behavior
3302
3430
class cmd_whoami(Command):
3321
3450
encoding_type = 'replace'
3323
3452
@display_command
3324
def run(self, email=False, branch=False, name=None):
3453
def run(self, email=False, branch=False, name=None, directory=None):
3325
3454
if name is None:
3326
# use branch if we're inside one; otherwise global config
3328
c = Branch.open_containing('.')[0].get_config()
3329
except errors.NotBranchError:
3330
c = config.GlobalConfig()
3455
if directory is None:
3456
# use branch if we're inside one; otherwise global config
3458
c = Branch.open_containing(u'.')[0].get_config()
3459
except errors.NotBranchError:
3460
c = _mod_config.GlobalConfig()
3462
c = Branch.open(directory).get_config()
3332
3464
self.outf.write(c.user_email() + '\n')
3334
3466
self.outf.write(c.username() + '\n')
3470
raise errors.BzrCommandError("--email can only be used to display existing "
3337
3473
# display a warning if an email address isn't included in the given name.
3339
config.extract_email_address(name)
3475
_mod_config.extract_email_address(name)
3340
3476
except errors.NoEmailInUsername, e:
3341
3477
warning('"%s" does not seem to contain an email address. '
3342
3478
'This is allowed, but not recommended.', name)
3344
3480
# use global config unless --branch given
3346
c = Branch.open_containing('.')[0].get_config()
3482
if directory is None:
3483
c = Branch.open_containing(u'.')[0].get_config()
3485
c = Branch.open(directory).get_config()
3348
c = config.GlobalConfig()
3487
c = _mod_config.GlobalConfig()
3349
3488
c.set_user_option('email', name)
3418
3557
'bzr alias --remove expects an alias to remove.')
3419
3558
# If alias is not found, print something like:
3420
3559
# unalias: foo: not found
3421
c = config.GlobalConfig()
3560
c = _mod_config.GlobalConfig()
3422
3561
c.unset_alias(alias_name)
3424
3563
@display_command
3425
3564
def print_aliases(self):
3426
3565
"""Print out the defined aliases in a similar format to bash."""
3427
aliases = config.GlobalConfig().get_aliases()
3566
aliases = _mod_config.GlobalConfig().get_aliases()
3428
3567
for key, value in sorted(aliases.iteritems()):
3429
3568
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3519
3661
'throughout the test suite.',
3520
3662
type=get_transport_type),
3521
3663
Option('benchmark',
3522
help='Run the benchmarks rather than selftests.'),
3664
help='Run the benchmarks rather than selftests.',
3523
3666
Option('lsprof-timed',
3524
3667
help='Generate lsprof output for benchmarked'
3525
3668
' sections of code.'),
3526
3669
Option('lsprof-tests',
3527
3670
help='Generate lsprof output for each test.'),
3528
Option('cache-dir', type=str,
3529
help='Cache intermediate benchmark output in this '
3531
3671
Option('first',
3532
3672
help='Run all tests, but run specified tests first.',
3533
3673
short_name='f',
3568
3708
def run(self, testspecs_list=None, verbose=False, one=False,
3569
3709
transport=None, benchmark=None,
3570
lsprof_timed=None, cache_dir=None,
3571
3711
first=False, list_only=False,
3572
3712
randomize=None, exclude=None, strict=False,
3573
3713
load_list=None, debugflag=None, starting_with=None, subunit=False,
3574
3714
parallel=None, lsprof_tests=False):
3575
from bzrlib.tests import selftest
3576
import bzrlib.benchmarks as benchmarks
3577
from bzrlib.benchmarks import tree_creator
3579
# Make deprecation warnings visible, unless -Werror is set
3580
symbol_versioning.activate_deprecation_warnings(override=False)
3582
if cache_dir is not None:
3583
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3715
from bzrlib import tests
3584
3717
if testspecs_list is not None:
3585
3718
pattern = '|'.join(testspecs_list)
3594
3727
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
3728
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
3729
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3730
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3731
# following code can be deleted when it's sufficiently deployed
3732
# -- vila/mgz 20100514
3733
if (sys.platform == "win32"
3734
and getattr(sys.stdout, 'fileno', None) is not None):
3599
3736
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3601
3738
self.additional_selftest_args.setdefault(
3602
3739
'suite_decorators', []).append(parallel)
3604
test_suite_factory = benchmarks.test_suite
3605
# Unless user explicitly asks for quiet, be verbose in benchmarks
3606
verbose = not is_quiet()
3607
# TODO: should possibly lock the history file...
3608
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3611
test_suite_factory = None
3741
raise errors.BzrCommandError(
3742
"--benchmark is no longer supported from bzr 2.2; "
3743
"use bzr-usertest instead")
3744
test_suite_factory = None
3613
3745
selftest_kwargs = {"verbose": verbose,
3614
3746
"pattern": pattern,
3615
3747
"stop_on_failure": one,
3691
3829
with bzr send. If neither is specified, the default is the upstream branch
3692
3830
or the branch most recently merged using --remember.
3694
When merging a branch, by default the tip will be merged. To pick a different
3695
revision, pass --revision. If you specify two values, the first will be used as
3696
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3697
available revisions, like this is commonly referred to as "cherrypicking".
3699
Revision numbers are always relative to the branch being merged.
3701
By default, bzr will try to merge in all new work from the other
3702
branch, automatically determining an appropriate base. If this
3703
fails, you may need to give an explicit base.
3832
When merging from a branch, by default bzr will try to merge in all new
3833
work from the other branch, automatically determining an appropriate base
3834
revision. If this fails, you may need to give an explicit base.
3836
To pick a different ending revision, pass "--revision OTHER". bzr will
3837
try to merge in all new work up to and including revision OTHER.
3839
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3840
through OTHER, excluding BASE but including OTHER, will be merged. If this
3841
causes some revisions to be skipped, i.e. if the destination branch does
3842
not already contain revision BASE, such a merge is commonly referred to as
3845
Revision numbers are always relative to the source branch.
3705
3847
Merge will do its best to combine the changes in two branches, but there
3706
3848
are some kinds of problems only a human can fix. When it encounters those,
3881
4023
def _do_preview(self, merger):
3882
4024
from bzrlib.diff import show_diff_trees
3883
4025
result_tree = self._get_preview(merger)
4026
path_encoding = osutils.get_diff_header_encoding()
3884
4027
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
old_label='', new_label='')
4028
old_label='', new_label='',
4029
path_encoding=path_encoding)
3887
4031
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3888
4032
merger.change_reporter = change_reporter
3968
4112
if ((remember or tree.branch.get_submit_branch() is None) and
3969
4113
user_location is not None):
3970
4114
tree.branch.set_submit_branch(other_branch.base)
3971
_merge_tags_if_possible(other_branch, tree.branch)
4115
# Merge tags (but don't set them in the master branch yet, the user
4116
# might revert this merge). Commit will propagate them.
4117
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3972
4118
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3973
4119
other_revision_id, base_revision_id, other_branch, base_branch)
3974
4120
if other_path != '':
4142
4288
last committed revision is used.
4144
4290
To remove only some changes, without reverting to a prior version, use
4145
merge instead. For example, "merge . --revision -2..-3" will remove the
4146
changes introduced by -2, without affecting the changes introduced by -1.
4147
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4291
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4292
will remove the changes introduced by the second last commit (-2), without
4293
affecting the changes introduced by the last commit (-1). To remove
4294
certain changes on a hunk-by-hunk basis, see the shelve command.
4149
4296
By default, any files that have been manually changed will be backed up
4150
4297
first. (Files changed only by merge are not backed up.) Backup files have
4314
4462
theirs_only=False,
4315
4463
log_format=None, long=False, short=False, line=False,
4316
4464
show_ids=False, verbose=False, this=False, other=False,
4317
include_merges=False, revision=None, my_revision=None):
4465
include_merges=False, revision=None, my_revision=None,
4318
4467
from bzrlib.missing import find_unmerged, iter_log_revisions
4319
4468
def message(s):
4320
4469
if not is_quiet():
4478
4627
@display_command
4479
4628
def run(self, verbose=False):
4480
import bzrlib.plugin
4481
from inspect import getdoc
4483
for name, plugin in bzrlib.plugin.plugins().items():
4484
version = plugin.__version__
4485
if version == 'unknown':
4487
name_ver = '%s %s' % (name, version)
4488
d = getdoc(plugin.module)
4490
doc = d.split('\n')[0]
4492
doc = '(no description)'
4493
result.append((name_ver, doc, plugin.path()))
4494
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4629
from bzrlib import plugin
4630
self.outf.writelines(
4631
plugin.describe_plugins(show_paths=verbose))
4502
4634
class cmd_testament(Command):
4564
4696
self.add_cleanup(branch.lock_read().unlock)
4565
4697
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
4698
self.add_cleanup(tree.lock_read().unlock)
4699
if wt is not None and revision is None:
4568
4700
file_id = wt.path2id(relpath)
4570
4702
file_id = tree.path2id(relpath)
4571
4703
if file_id is None:
4572
4704
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
4705
if wt is not None and revision is None:
4575
4706
# If there is a tree and we're not annotating historical
4576
4707
# versions, annotate the working tree's content.
4577
4708
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
4709
show_ids=show_ids)
4711
file_version = tree.inventory[file_id].revision
4580
4712
annotate_file(branch, file_version, file_id, long, all, self.outf,
4581
4713
show_ids=show_ids)
4824
4962
bzr break-lock bzr+ssh://example.com/bzr/foo
4963
bzr break-lock --conf ~/.bazaar
4826
4966
takes_args = ['location?']
4969
help='LOCATION is the directory where the config lock is.'),
4971
help='Do not ask for confirmation before breaking the lock.'),
4828
def run(self, location=None, show=False):
4974
def run(self, location=None, config=False, force=False):
4829
4975
if location is None:
4830
4976
location = u'.'
4831
control, relpath = bzrdir.BzrDir.open_containing(location)
4833
control.break_lock()
4834
except NotImplementedError:
4978
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
4980
{'bzrlib.lockdir.break': True})
4982
conf = _mod_config.LockableConfig(file_name=location)
4985
control, relpath = bzrdir.BzrDir.open_containing(location)
4987
control.break_lock()
4988
except NotImplementedError:
4838
4992
class cmd_wait_until_signalled(Command):
4902
5056
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4903
5057
protocol=None):
4904
from bzrlib.transport import get_transport, transport_server_registry
5058
from bzrlib import transport
4905
5059
if directory is None:
4906
5060
directory = os.getcwd()
4907
5061
if protocol is None:
4908
protocol = transport_server_registry.get()
5062
protocol = transport.transport_server_registry.get()
4909
5063
host, port = self.get_host_and_port(port)
4910
5064
url = urlutils.local_path_to_url(directory)
4911
5065
if not allow_writes:
4912
5066
url = 'readonly+' + url
4913
transport = get_transport(url)
4914
protocol(transport, host, port, inet)
5067
t = transport.get_transport(url)
5068
protocol(t, host, port, inet)
4917
5071
class cmd_join(Command):
5028
5183
encoding_type = 'exact'
5030
5185
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5031
sign=False, revision=None, mail_to=None, message=None):
5186
sign=False, revision=None, mail_to=None, message=None,
5032
5188
from bzrlib.revision import ensure_null, NULL_REVISION
5033
5189
include_patch, include_bundle = {
5034
5190
'plain': (False, False),
5035
5191
'diff': (True, False),
5036
5192
'bundle': (True, True),
5038
branch = Branch.open('.')
5194
branch = Branch.open(directory)
5039
5195
stored_submit_branch = branch.get_submit_branch()
5040
5196
if submit_branch is None:
5041
5197
submit_branch = stored_submit_branch
5354
5510
takes_options = [
5355
5511
custom_help('directory',
5356
5512
help='Branch whose tags should be displayed.'),
5357
RegistryOption.from_kwargs('sort',
5513
RegistryOption('sort',
5358
5514
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
5515
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5366
5521
@display_command
5522
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5523
from bzrlib.tag import tag_sort_methods
5373
5524
branch, relpath = Branch.open_containing(directory)
5375
5526
tags = branch.tags.get_tag_dict().items()
5384
5535
# only show revisions between revid1 and revid2 (inclusive)
5385
5536
tags = [(tag, revid) for tag, revid in tags if
5386
5537
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5539
sort = tag_sort_methods.get()
5400
5541
if not show_ids:
5401
5542
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
5543
for index, (tag, revid) in enumerate(tags):
5540
5682
def run(self, to_location=None, force=False, create_branch=False,
5683
revision=None, directory=u'.'):
5542
5684
from bzrlib import switch
5685
tree_location = directory
5544
5686
revision = _get_one_revision('switch', revision)
5545
5687
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
5688
if to_location is None:
5547
5689
if revision is None:
5548
5690
raise errors.BzrCommandError('You must supply either a'
5549
5691
' revision or a location')
5692
to_location = tree_location
5552
5694
branch = control_dir.open_branch()
5553
5695
had_explicit_nick = branch.get_config().has_explicit_nickname()
5824
5967
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
5968
restore the most recently shelved changes.
5970
For complicated changes, it is possible to edit the changes in a separate
5971
editor program to decide what the file remaining in the working copy
5972
should look like. To do this, add the configuration option
5974
change_editor = PROGRAM @new_path @old_path
5976
where @new_path is replaced with the path of the new version of the
5977
file and @old_path is replaced with the path of the old version of
5978
the file. The PROGRAM should save the new file with the desired
5979
contents of the file in the working tree.
5828
5983
takes_args = ['file*']
5830
5985
takes_options = [
5832
5988
Option('all', help='Shelve all changes.'),
5839
5995
Option('destroy',
5840
5996
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
5998
_see_also = ['unshelve', 'configuration']
5844
6000
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6001
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
6003
return self.run_for_list(directory=directory)
5848
6004
from bzrlib.shelf_ui import Shelver
5849
6005
if writer is None:
5850
6006
writer = bzrlib.option.diff_writer_registry.get()
5852
6008
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6009
file_list, message, destroy=destroy, directory=directory)
5924
6083
takes_options = ['directory',
5925
6084
Option('ignored', help='Delete all ignored files.'),
5926
Option('detritus', help='Delete conflict files, merge'
6085
Option('detritus', help='Delete conflict files, merge and revert'
5927
6086
' backups, and failed selftest dirs.'),
5928
6087
Option('unknown',
5929
6088
help='Delete files unknown to bzr (default).'),
5993
6152
# be only called once.
5994
6153
for (name, aliases, module_name) in [
5995
6154
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6155
('cmd_config', [], 'bzrlib.config'),
5996
6156
('cmd_dpush', [], 'bzrlib.foreign'),
5997
6157
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
6158
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
6159
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
6160
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6161
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6002
6163
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
