/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2010-11-05 20:54:32 UTC
  • mfrom: (5526 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5527.
  • Revision ID: john@arbash-meinel.com-20101105205432-rmyozu8sthyhmri8
Merge bzr.dev to resolve bzr-2.3.txt (aka NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
21
21
from bzrlib.lazy_import import lazy_import
22
22
lazy_import(globals(), """
23
23
import cStringIO
 
24
import itertools
 
25
import re
24
26
import sys
25
27
import time
26
28
 
250
252
    To skip the display of pending merge information altogether, use
251
253
    the no-pending option or specify a file/directory.
252
254
 
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.
 
257
 
 
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'.
255
261
    """
256
262
 
257
263
    # TODO: --no-recurse, --recurse options
923
929
                 "branch.  Local pulls are not applied to "
924
930
                 "the master branch."
925
931
            ),
 
932
        Option('show-base',
 
933
            help="Show base revision text in conflicts.")
926
934
        ]
927
935
    takes_args = ['location?']
928
936
    encoding_type = 'replace'
929
937
 
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,
 
941
            show_base=False):
933
942
        # FIXME: too much stuff is in the command class
934
943
        revision_id = None
935
944
        mergeable = None
944
953
            branch_to = Branch.open_containing(directory)[0]
945
954
            self.add_cleanup(branch_to.lock_write().unlock)
946
955
 
 
956
        if tree_to is None and show_base:
 
957
            raise errors.BzrCommandError("Need working tree for --show-base.")
 
958
 
947
959
        if local and not branch_to.get_bound_location():
948
960
            raise errors.LocalRequiresBoundBranch()
949
961
 
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)
998
1011
        else:
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.'),
 
1072
        Option('no-tree',
 
1073
               help="Don't populate the working tree, even for protocols"
 
1074
               " that support it."),
1059
1075
        ]
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
1068
1084
 
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)
1119
1135
 
1120
1136
 
1121
1137
class cmd_branch(Command):
1363
1379
 
1364
1380
    _see_also = ['pull', 'working-trees', 'status-flags']
1365
1381
    takes_args = ['dir?']
1366
 
    takes_options = ['revision']
 
1382
    takes_options = ['revision',
 
1383
                     Option('show-base',
 
1384
                            help="Show base revision text in conflicts."),
 
1385
                     ]
1367
1386
    aliases = ['up']
1368
1387
 
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,
1415
 
                old_tip=old_tip)
 
1434
                old_tip=old_tip,
 
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'
1501
1523
 
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 "
 
1528
                "in future.)")
 
1529
            file_deletion_strategy = 'no-backup'
 
1530
 
1504
1531
        tree, file_list = WorkingTree.open_containing_paths(file_list)
1505
1532
 
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'))
1531
1558
 
1532
1559
 
1533
1560
class cmd_file_id(Command):
1688
1715
                ),
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.'),
 
1719
         Option('no-tree',
 
1720
                'Create a branch without a working tree.')
1692
1721
         ]
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
 
1752
            if no_tree:
 
1753
                force_new_tree = False
 
1754
            else:
 
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
1726
1760
        else:
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()
 
1768
            if not no_tree:
 
1769
                a_bzrdir.create_workingtree()
1735
1770
        if append_revisions_only:
1736
1771
            try:
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".
1833
1868
 
 
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
 
1874
    in the range.
 
1875
 
1834
1876
    :Exit values:
1835
1877
        1 - changed
1836
1878
        2 - unrepresentable changes
1854
1896
 
1855
1897
            bzr diff -r1..3 xxx
1856
1898
 
1857
 
        To see the changes introduced in revision X::
 
1899
        The changes introduced by revision 2 (equivalent to -r1..2)::
 
1900
 
 
1901
            bzr diff -c2
 
1902
 
 
1903
        To see the changes introduced by revision X::
1858
1904
        
1859
1905
            bzr diff -cX
1860
1906
 
1864
1910
 
1865
1911
            bzr diff -r<chosen_parent>..X
1866
1912
 
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)
1868
1915
 
1869
 
            bzr diff -c2
 
1916
            bzr diff -r-2..
1870
1917
 
1871
1918
        Show just the differences for file NEWS::
1872
1919
 
2641
2688
    Patterns prefixed with '!!' act as regular ignore patterns, but have
2642
2689
    precedence over the '!' exception patterns.
2643
2690
 
2644
 
    Note: ignore patterns containing shell wildcards must be quoted from
2645
 
    the shell on Unix.
 
2691
    :Notes: 
 
2692
        
 
2693
    * Ignore patterns containing shell wildcards must be quoted from
 
2694
      the shell on Unix.
 
2695
 
 
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.
2646
2698
 
2647
2699
    :Examples:
2648
2700
        Ignore the top level Makefile::
2657
2709
 
2658
2710
            bzr ignore "!special.class"
2659
2711
 
 
2712
        Ignore files whose name begins with the "#" character::
 
2713
 
 
2714
            bzr ignore "RE:^#"
 
2715
 
2660
2716
        Ignore .o files under the lib directory::
2661
2717
 
2662
2718
            bzr ignore "lib/**/*.o"
5353
5409
            if tag_name is None:
5354
5410
                raise errors.BzrCommandError("No tag specified to delete.")
5355
5411
            branch.tags.delete_tag(tag_name)
5356
 
            self.outf.write('Deleted tag %s.\n' % tag_name)
 
5412
            note('Deleted tag %s.' % tag_name)
5357
5413
        else:
5358
5414
            if revision:
5359
5415
                if len(revision) != 1:
5371
5427
            if (not force) and branch.tags.has_tag(tag_name):
5372
5428
                raise errors.TagAlreadyExists(tag_name)
5373
5429
            branch.tags.set_tag(tag_name, revision_id)
5374
 
            self.outf.write('Created tag %s.\n' % tag_name)
 
5430
            note('Created tag %s.' % tag_name)
5375
5431
 
5376
5432
 
5377
5433
class cmd_tags(Command):
5386
5442
            help='Branch whose tags should be displayed.'),
5387
5443
        RegistryOption.from_kwargs('sort',
5388
5444
            'Sort tags by different criteria.', title='Sorting',
5389
 
            alpha='Sort tags lexicographically (default).',
 
5445
            natural='Sort numeric substrings as numbers:'
 
5446
                    ' suitable for version numbers. (default)',
 
5447
            alpha='Sort tags lexicographically.',
5390
5448
            time='Sort tags chronologically.',
5391
5449
            ),
5392
5450
        'show-ids',
5396
5454
    @display_command
5397
5455
    def run(self,
5398
5456
            directory='.',
5399
 
            sort='alpha',
 
5457
            sort='natural',
5400
5458
            show_ids=False,
5401
5459
            revision=None,
5402
5460
            ):
5414
5472
            # only show revisions between revid1 and revid2 (inclusive)
5415
5473
            tags = [(tag, revid) for tag, revid in tags if
5416
5474
                graph.is_between(revid, revid1, revid2)]
5417
 
        if sort == 'alpha':
 
5475
        if sort == 'natural':
 
5476
            def natural_sort_key(tag):
 
5477
                return [f(s) for f,s in 
 
5478
                        zip(itertools.cycle((unicode.lower,int)),
 
5479
                                            re.split('([0-9]+)', tag[0]))]
 
5480
            tags.sort(key=natural_sort_key)
 
5481
        elif sort == 'alpha':
5418
5482
            tags.sort()
5419
5483
        elif sort == 'time':
5420
5484
            timestamps = {}
5830
5894
            location = "."
5831
5895
        branch = Branch.open_containing(location)[0]
5832
5896
        branch.bzrdir.destroy_branch()
5833
 
        
 
5897
 
5834
5898
 
5835
5899
class cmd_shelve(Command):
5836
5900
    __doc__ = """Temporarily set aside some changes from the current tree.
5855
5919
 
5856
5920
    You can put multiple items on the shelf, and by default, 'unshelve' will
5857
5921
    restore the most recently shelved changes.
 
5922
 
 
5923
    For complicated changes, it is possible to edit the changes in a separate
 
5924
    editor program to decide what the file remaining in the working copy
 
5925
    should look like.  To do this, add the configuration option
 
5926
 
 
5927
        change_editor = PROGRAM @new_path @old_path
 
5928
 
 
5929
    where @new_path is replaced with the path of the new version of the 
 
5930
    file and @old_path is replaced with the path of the old version of 
 
5931
    the file.  The PROGRAM should save the new file with the desired 
 
5932
    contents of the file in the working tree.
 
5933
        
5858
5934
    """
5859
5935
 
5860
5936
    takes_args = ['file*']
5872
5948
        Option('destroy',
5873
5949
               help='Destroy removed changes instead of shelving them.'),
5874
5950
    ]
5875
 
    _see_also = ['unshelve']
 
5951
    _see_also = ['unshelve', 'configuration']
5876
5952
 
5877
5953
    def run(self, revision=None, all=False, file_list=None, message=None,
5878
 
            writer=None, list=False, destroy=False, directory=u'.'):
 
5954
            writer=None, list=False, destroy=False, directory=None):
5879
5955
        if list:
5880
 
            return self.run_for_list()
 
5956
            return self.run_for_list(directory=directory)
5881
5957
        from bzrlib.shelf_ui import Shelver
5882
5958
        if writer is None:
5883
5959
            writer = bzrlib.option.diff_writer_registry.get()
5891
5967
        except errors.UserAbort:
5892
5968
            return 0
5893
5969
 
5894
 
    def run_for_list(self):
5895
 
        tree = WorkingTree.open_containing('.')[0]
 
5970
    def run_for_list(self, directory=None):
 
5971
        if directory is None:
 
5972
            directory = u'.'
 
5973
        tree = WorkingTree.open_containing(directory)[0]
5896
5974
        self.add_cleanup(tree.lock_read().unlock)
5897
5975
        manager = tree.get_shelf_manager()
5898
5976
        shelves = manager.active_shelves()
6027
6105
    # be only called once.
6028
6106
    for (name, aliases, module_name) in [
6029
6107
        ('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
 
6108
        ('cmd_config', [], 'bzrlib.config'),
6030
6109
        ('cmd_dpush', [], 'bzrlib.foreign'),
6031
6110
        ('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6032
6111
        ('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6033
6112
        ('cmd_conflicts', [], 'bzrlib.conflicts'),
6034
6113
        ('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
 
6114
        ('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6035
6115
        ]:
6036
6116
        builtin_command_registry.register_lazy(name, aliases, module_name)