/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 revspec.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-11 16:06:53 UTC
  • mto: (4286.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4287.
  • Revision ID: v.ladeuil+lp@free.fr-20090411160653-eq1gfn41q3lzhmss
Cleanup test imports and use features to better track skipped tests.

* bzrlib/tests/workingtree_implementations/__init__.py: 
Fix imports. Delete obsolete comment.

* bzrlib/tests/tree_implementations/test_walkdirs.py:
(TestWalkdirs.get_all_subdirs_expected): Reduce duplication.

* bzrlib/tests/tree_implementations/test_test_trees.py: 
Fix import.

* bzrlib/tests/tree_implementations/test_path_content_summary.py: 
Fix imports.

(TestPathContentSummary.test_unicode_symlink_content_summary,
TestPathContentSummary.test_unicode_symlink_target_summary):Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/test_inv.py: 
Fix imports.
(TestInventoryWithSymlinks): Factor out test that requires
symlinks and use _test_needs_features.
(TestInventory.test_canonical_path,
TestInventory.test_canonical_path_dir,
TestInventory.test_canonical_path_root,
TestInventory.test_canonical_path_invalid_all,
TestInventory.test_canonical_invalid_child): Use assert(expected,
actual)

* bzrlib/tests/tree_implementations/test_get_symlink_target.py: 
Fix imports.
(TestGetSymlinkTarget.test_get_unicode_symlink_target): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/__init__.py: 
Fix imports.

(TestCaseWithTree.get_tree_with_subdirs_and_all_supported_content_types,
TestCaseWithTree._create_tree_with_utf8): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/test_workingtree_4.py:
Fix too long lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revspec.py
1
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
 
 
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 3 of the License, or
6
 
# (at your option) any later version.
7
 
 
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
 
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
"""Custom revision specifier for Subversion."""
17
 
 
18
 
from bzrlib.errors import BzrError, InvalidRevisionSpec, NoSuchRevision
19
 
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
20
 
 
21
 
from bzrlib.plugins.git import lazy_check_versions
22
 
 
23
 
class RevisionSpec_git(RevisionSpec):
24
 
    """Selects a revision using a Subversion revision number."""
25
 
 
26
 
    help_txt = """Selects a revision using a Git revision sha1.
27
 
    """
28
 
    
29
 
    prefix = 'git:'
30
 
 
31
 
    def _match_on(self, branch, revs):
32
 
        lazy_check_versions()
33
 
        loc = self.spec.find(':')
34
 
        git_sha1 = self.spec[loc+1:].encode("utf-8")
35
 
        bzr_revid = branch.mapping.revision_id_foreign_to_bzr(git_sha1)
36
 
        if branch.repository.has_revision(bzr_revid):
37
 
            history = list(branch.repository.iter_reverse_revision_history(bzr_revid))
38
 
            history.reverse()
39
 
            return RevisionInfo.from_revision_id(branch, bzr_revid, history)
40
 
        raise InvalidRevisionSpec(self.user_spec, branch)
41
 
 
42
 
    def needs_branch(self):
43
 
        return True
44
 
 
45
 
    def get_branch(self):
46
 
        return None