250
252
To skip the display of pending merge information altogether, use
251
253
the no-pending option or specify a file/directory.
253
If a revision argument is given, the status is calculated against
254
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'.
257
263
# TODO: --no-recurse, --recurse options
923
929
"branch. Local pulls are not applied to "
924
930
"the master branch."
933
help="Show base revision text in conflicts.")
927
935
takes_args = ['location?']
928
936
encoding_type = 'replace'
930
938
def run(self, location=None, remember=False, overwrite=False,
931
939
revision=None, verbose=False,
932
directory=None, local=False):
940
directory=None, local=False,
933
942
# FIXME: too much stuff is in the command class
934
943
revision_id = None
944
953
branch_to = Branch.open_containing(directory)[0]
945
954
self.add_cleanup(branch_to.lock_write().unlock)
956
if tree_to is None and show_base:
957
raise errors.BzrCommandError("Need working tree for --show-base.")
947
959
if local and not branch_to.get_bound_location():
948
960
raise errors.LocalRequiresBoundBranch()
994
1006
view_info=view_info)
995
1007
result = tree_to.pull(
996
1008
branch_from, overwrite, revision_id, change_reporter,
997
possible_transports=possible_transports, local=local)
1009
possible_transports=possible_transports, local=local,
1010
show_base=show_base)
999
1012
result = branch_to.pull(
1000
1013
branch_from, overwrite, revision_id, local=local)
1056
1069
Option('strict',
1057
1070
help='Refuse to push if there are uncommitted changes in'
1058
1071
' the working tree, --no-strict disables the check.'),
1073
help="Don't populate the working tree, even for protocols"
1074
" that support it."),
1060
1076
takes_args = ['location?']
1061
1077
encoding_type = 'replace'
1063
1079
def run(self, location=None, remember=False, overwrite=False,
1064
1080
create_prefix=False, verbose=False, revision=None,
1065
1081
use_existing_dir=False, directory=None, stacked_on=None,
1066
stacked=False, strict=None):
1082
stacked=False, strict=None, no_tree=False):
1067
1083
from bzrlib.push import _show_push_branch
1069
1085
if directory is None:
1115
1131
_show_push_branch(br_from, revision_id, location, self.outf,
1116
1132
verbose=verbose, overwrite=overwrite, remember=remember,
1117
1133
stacked_on=stacked_on, create_prefix=create_prefix,
1118
use_existing_dir=use_existing_dir)
1134
use_existing_dir=use_existing_dir, no_tree=no_tree)
1121
1137
class cmd_branch(Command):
1364
1380
_see_also = ['pull', 'working-trees', 'status-flags']
1365
1381
takes_args = ['dir?']
1366
takes_options = ['revision']
1382
takes_options = ['revision',
1384
help="Show base revision text in conflicts."),
1367
1386
aliases = ['up']
1369
def run(self, dir='.', revision=None):
1388
def run(self, dir='.', revision=None, show_base=None):
1370
1389
if revision is not None and len(revision) != 1:
1371
1390
raise errors.BzrCommandError(
1372
1391
"bzr update --revision takes exactly one revision")
1412
1431
change_reporter,
1413
1432
possible_transports=possible_transports,
1414
1433
revision=revision_id,
1435
show_base=show_base)
1416
1436
except errors.NoSuchRevision, e:
1417
1437
raise errors.BzrCommandError(
1418
1438
"branch has no revision %s\n"
1494
1514
title='Deletion Strategy', value_switches=True, enum_switch=False,
1495
1515
safe='Backup changed files (default).',
1496
1516
keep='Delete from bzr but leave the working copy.',
1517
no_backup='Don\'t backup changed files.',
1497
1518
force='Delete all the specified files, even if they can not be '
1498
'recovered and even if they are non-empty directories.')]
1519
'recovered and even if they are non-empty directories. '
1520
'(deprecated, use no-backup)')]
1499
1521
aliases = ['rm', 'del']
1500
1522
encoding_type = 'replace'
1502
1524
def run(self, file_list, verbose=False, new=False,
1503
1525
file_deletion_strategy='safe'):
1526
if file_deletion_strategy == 'force':
1527
note("(The --force option is deprecated, rather use --no-backup "
1529
file_deletion_strategy = 'no-backup'
1504
1531
tree, file_list = WorkingTree.open_containing_paths(file_list)
1506
1533
if file_list is not None:
1527
1554
file_deletion_strategy = 'keep'
1528
1555
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1529
1556
keep_files=file_deletion_strategy=='keep',
1530
force=file_deletion_strategy=='force')
1557
force=(file_deletion_strategy=='no-backup'))
1533
1560
class cmd_file_id(Command):
1689
1716
Option('append-revisions-only',
1690
1717
help='Never change revnos or the existing log.'
1691
' Append revisions to it only.')
1718
' Append revisions to it only.'),
1720
'Create a branch without a working tree.')
1693
1722
def run(self, location=None, format=None, append_revisions_only=False,
1694
create_prefix=False):
1723
create_prefix=False, no_tree=False):
1695
1724
if format is None:
1696
1725
format = bzrdir.format_registry.make_bzrdir('default')
1697
1726
if location is None:
1720
1749
except errors.NotBranchError:
1721
1750
# really a NotBzrDir error...
1722
1751
create_branch = bzrdir.BzrDir.create_branch_convenience
1753
force_new_tree = False
1755
force_new_tree = None
1723
1756
branch = create_branch(to_transport.base, format=format,
1724
possible_transports=[to_transport])
1757
possible_transports=[to_transport],
1758
force_new_tree=force_new_tree)
1725
1759
a_bzrdir = branch.bzrdir
1727
1761
from bzrlib.transport.local import LocalTransport
1731
1765
raise errors.BranchExistsWithoutWorkingTree(location)
1732
1766
raise errors.AlreadyBranchError(location)
1733
1767
branch = a_bzrdir.create_branch()
1734
a_bzrdir.create_workingtree()
1769
a_bzrdir.create_workingtree()
1735
1770
if append_revisions_only:
1737
1772
branch.set_append_revisions_only(True)
1831
1866
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1832
1867
produces patches suitable for "patch -p1".
1869
Note that when using the -r argument with a range of revisions, the
1870
differences are computed between the two specified revisions. That
1871
is, the command does not show the changes introduced by the first
1872
revision in the range. This differs from the interpretation of
1873
revision ranges used by "bzr log" which includes the first revision
1836
1878
2 - unrepresentable changes
1865
1911
bzr diff -r<chosen_parent>..X
1867
The changes introduced by revision 2 (equivalent to -r1..2)::
1913
The changes between the current revision and the previous revision
1914
(equivalent to -c-1 and -r-2..-1)
1871
1918
Show just the differences for file NEWS::
2641
2688
Patterns prefixed with '!!' act as regular ignore patterns, but have
2642
2689
precedence over the '!' exception patterns.
2644
Note: ignore patterns containing shell wildcards must be quoted from
2693
* Ignore patterns containing shell wildcards must be quoted from
2696
* Ignore patterns starting with "#" act as comments in the ignore file.
2697
To ignore patterns that begin with that character, use the "RE:" prefix.
2648
2700
Ignore the top level Makefile::
3693
3749
with bzr send. If neither is specified, the default is the upstream branch
3694
3750
or the branch most recently merged using --remember.
3696
When merging a branch, by default the tip will be merged. To pick a different
3697
revision, pass --revision. If you specify two values, the first will be used as
3698
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3699
available revisions, like this is commonly referred to as "cherrypicking".
3701
Revision numbers are always relative to the branch being merged.
3703
By default, bzr will try to merge in all new work from the other
3704
branch, automatically determining an appropriate base. If this
3705
fails, you may need to give an explicit base.
3752
When merging from a branch, by default bzr will try to merge in all new
3753
work from the other branch, automatically determining an appropriate base
3754
revision. If this fails, you may need to give an explicit base.
3756
To pick a different ending revision, pass "--revision OTHER". bzr will
3757
try to merge in all new work up to and including revision OTHER.
3759
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3760
through OTHER, excluding BASE but including OTHER, will be merged. If this
3761
causes some revisions to be skipped, i.e. if the destination branch does
3762
not already contain revision BASE, such a merge is commonly referred to as
3765
Revision numbers are always relative to the source branch.
3707
3767
Merge will do its best to combine the changes in two branches, but there
3708
3768
are some kinds of problems only a human can fix. When it encounters those,
3972
4032
if ((remember or tree.branch.get_submit_branch() is None) and
3973
4033
user_location is not None):
3974
4034
tree.branch.set_submit_branch(other_branch.base)
3975
_merge_tags_if_possible(other_branch, tree.branch)
4035
# Merge tags (but don't set them in the master branch yet, the user
4036
# might revert this merge). Commit will propagate them.
4037
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3976
4038
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3977
4039
other_revision_id, base_revision_id, other_branch, base_branch)
3978
4040
if other_path != '':
4146
4208
last committed revision is used.
4148
4210
To remove only some changes, without reverting to a prior version, use
4149
merge instead. For example, "merge . --revision -2..-3" will remove the
4150
changes introduced by -2, without affecting the changes introduced by -1.
4151
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4211
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4212
will remove the changes introduced by the second last commit (-2), without
4213
affecting the changes introduced by the last commit (-1). To remove
4214
certain changes on a hunk-by-hunk basis, see the shelve command.
4153
4216
By default, any files that have been manually changed will be backed up
4154
4217
first. (Files changed only by merge are not backed up.) Backup files have
4184
4247
target branches.
4187
_see_also = ['cat', 'export']
4250
_see_also = ['cat', 'export', 'merge', 'shelve']
4188
4251
takes_options = [
4190
4253
Option('no-backup', "Do not save backups of reverted files."),
5371
5434
if (not force) and branch.tags.has_tag(tag_name):
5372
5435
raise errors.TagAlreadyExists(tag_name)
5373
5436
branch.tags.set_tag(tag_name, revision_id)
5374
self.outf.write('Created tag %s.\n' % tag_name)
5437
note('Created tag %s.' % tag_name)
5377
5440
class cmd_tags(Command):
5386
5449
help='Branch whose tags should be displayed.'),
5387
5450
RegistryOption.from_kwargs('sort',
5388
5451
'Sort tags by different criteria.', title='Sorting',
5389
alpha='Sort tags lexicographically (default).',
5452
natural='Sort numeric substrings as numbers:'
5453
' suitable for version numbers. (default)',
5454
alpha='Sort tags lexicographically.',
5390
5455
time='Sort tags chronologically.',
5414
5479
# only show revisions between revid1 and revid2 (inclusive)
5415
5480
tags = [(tag, revid) for tag, revid in tags if
5416
5481
graph.is_between(revid, revid1, revid2)]
5482
if sort == 'natural':
5483
def natural_sort_key(tag):
5484
return [f(s) for f,s in
5485
zip(itertools.cycle((unicode.lower,int)),
5486
re.split('([0-9]+)', tag[0]))]
5487
tags.sort(key=natural_sort_key)
5488
elif sort == 'alpha':
5419
5490
elif sort == 'time':
5420
5491
timestamps = {}
5856
5927
You can put multiple items on the shelf, and by default, 'unshelve' will
5857
5928
restore the most recently shelved changes.
5930
For complicated changes, it is possible to edit the changes in a separate
5931
editor program to decide what the file remaining in the working copy
5932
should look like. To do this, add the configuration option
5934
change_editor = PROGRAM @new_path @old_path
5936
where @new_path is replaced with the path of the new version of the
5937
file and @old_path is replaced with the path of the old version of
5938
the file. The PROGRAM should save the new file with the desired
5939
contents of the file in the working tree.
5860
5943
takes_args = ['file*']
5872
5955
Option('destroy',
5873
5956
help='Destroy removed changes instead of shelving them.'),
5875
_see_also = ['unshelve']
5958
_see_also = ['unshelve', 'configuration']
5877
5960
def run(self, revision=None, all=False, file_list=None, message=None,
5878
writer=None, list=False, destroy=False, directory=u'.'):
5961
writer=None, list=False, destroy=False, directory=None):
5880
return self.run_for_list()
5963
return self.run_for_list(directory=directory)
5881
5964
from bzrlib.shelf_ui import Shelver
5882
5965
if writer is None:
5883
5966
writer = bzrlib.option.diff_writer_registry.get()
5891
5974
except errors.UserAbort:
5894
def run_for_list(self):
5895
tree = WorkingTree.open_containing('.')[0]
5977
def run_for_list(self, directory=None):
5978
if directory is None:
5980
tree = WorkingTree.open_containing(directory)[0]
5896
5981
self.add_cleanup(tree.lock_read().unlock)
5897
5982
manager = tree.get_shelf_manager()
5898
5983
shelves = manager.active_shelves()
6027
6112
# be only called once.
6028
6113
for (name, aliases, module_name) in [
6029
6114
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6115
('cmd_config', [], 'bzrlib.config'),
6030
6116
('cmd_dpush', [], 'bzrlib.foreign'),
6031
6117
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6032
6118
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6033
6119
('cmd_conflicts', [], 'bzrlib.conflicts'),
6034
6120
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6121
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6036
6123
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
