kallithea Changeset - ca7785fae354

Changeset - ca7785fae354

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Mads Kiilerich - 13 years ago 2013-03-20 15:32:23
madski@unity3d.com

Transplanted from: 4279a42fd399

avoid %r markup of unicode strings in user facing messages

Improves
Revision u'b7f4...' does not exist for this repository

6 files changed with 21 insertions and 21 deletions:

rhodecode/lib/utils.py

rhodecode/lib/vcs/backends/git/changeset.py

rhodecode/lib/vcs/backends/git/repository.py

rhodecode/lib/vcs/backends/hg/changeset.py

rhodecode/lib/vcs/backends/hg/repository.py

rhodecode/tests/functional/test_files.py

0 comments (0 inline, 0 general)

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -765,13 +765,13 @@ def check_git_version(): @@
     if  _ver < StrictVersion(req_ver):
         to_old_git = True
     if 'git' in BACKENDS:
         log.debug('GIT version detected: %s' % stdout)
         if stderr:
             log.warning('Unable to detect git version org error was:%r' % stderr)
+            log.warning('Unable to detect git version, org error was: %r' % stderr)
         elif to_old_git:
             log.warning('RhodeCode detected git version %s, which is too old '
                         'for the system to function properly. Make sure '
                         'its version is at least %s' % (ver, req_ver))
     return _ver

rhodecode/lib/vcs/backends/git/changeset.py

➞

Show inline comments

@@ @@ -150,13 +150,13 @@ class GitChangeset(BaseChangeset): @@
                     else:
                         name = item
                     self._paths[name] = id
                     self._stat_modes[name] = stat
             if not path in self._paths:
                 raise NodeDoesNotExistError("There is no file nor directory "
-                    "at the given path %r at revision %r"
+                    "at the given path '%s' at revision %s"
                     % (path, self.short_id))
         return self._paths[path]
     def _get_kind(self, path):
         obj = self.repository._repo[self._get_id_for_path(path)]
         if isinstance(obj, objects.Blob):
@@ @@ -164,14 +164,14 @@ class GitChangeset(BaseChangeset): @@
         elif isinstance(obj, objects.Tree):
             return NodeKind.DIR
     def _get_filectx(self, path):
         path = self._fix_path(path)
         if self._get_kind(path) != NodeKind.FILE:
             raise ChangesetError("File does not exist for revision %r at "
                 " %r" % (self.raw_id, path))
             raise ChangesetError("File does not exist for revision %s at "
                 " '%s'" % (self.raw_id, path))
         return path
     def _get_file_nodes(self):
         return chain(*(t[2] for t in self.walk()))
     @LazyProperty
@@ @@ -391,14 +391,14 @@ class GitChangeset(BaseChangeset): @@
             chunk = popen.stdout.read(buffer_size)
         # Make sure all descriptors would be read
         popen.communicate()
     def get_nodes(self, path):
         if self._get_kind(path) != NodeKind.DIR:
             raise ChangesetError("Directory does not exist for revision %r at "
                 " %r" % (self.revision, path))
             raise ChangesetError("Directory does not exist for revision %s at "
                 " '%s'" % (self.revision, path))
         path = self._fix_path(path)
         id = self._get_id_for_path(path)
         tree = self.repository._repo[id]
         dirnodes = []
         filenodes = []
         als = self.repository.alias
@@ @@ -455,13 +455,13 @@ class GitChangeset(BaseChangeset): @@
                     node._tree = obj
                 elif isinstance(obj, objects.Blob):
                     node = FileNode(path, changeset=self)
                     node._blob = obj
                 else:
                     raise NodeDoesNotExistError("There is no file nor directory "
-                        "at the given path %r at revision %r"
+                        "at the given path '%s' at revision %s"
                         % (path, self.short_id))
             # cache node
             self.nodes[path] = node
         return self.nodes[path]
     @LazyProperty

rhodecode/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -264,13 +264,13 @@ class GitRepository(BaseRepository): @@
         if ((is_bstr(revision) and revision.isdigit() and len(revision) < 12)
             or isinstance(revision, int) or is_null(revision)):
             try:
                 revision = self.revisions[int(revision)]
             except:
-                raise ChangesetDoesNotExistError("Revision %r does not exist "
+                raise ChangesetDoesNotExistError("Revision %s does not exist "
                     "for this repository" % (revision))
         elif is_bstr(revision):
             # get by branch/tag name
             _ref_revision = self._parsed_refs.get(revision)
             _tags_shas = self.tags.values()
@@ @@ -279,18 +279,18 @@ class GitRepository(BaseRepository): @@
             # maybe it's a tag ? we don't have them in self.revisions
             elif revision in _tags_shas:
                 return _tags_shas[_tags_shas.index(revision)]
             elif not pattern.match(revision) or revision not in self.revisions:
-                raise ChangesetDoesNotExistError("Revision %r does not exist "
+                raise ChangesetDoesNotExistError("Revision %s does not exist "
                     "for this repository" % (revision))
         # Ensure we return full id
         if not pattern.match(str(revision)):
-            raise ChangesetDoesNotExistError("Given revision %r not recognized"
+            raise ChangesetDoesNotExistError("Given revision %s not recognized"
                 % revision)
         return revision
     def _get_archives(self, archive_name='tip'):
         for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]:

rhodecode/lib/vcs/backends/hg/changeset.py

➞

Show inline comments

@@ @@ -171,20 +171,20 @@ class MercurialChangeset(BaseChangeset): @@
         path = self._fix_path(path)
         if path in self._file_paths:
             return NodeKind.FILE
         elif path in self._dir_paths:
             return NodeKind.DIR
         else:
-            raise ChangesetError("Node does not exist at the given path %r"
+            raise ChangesetError("Node does not exist at the given path '%s'"
                 % (path))
     def _get_filectx(self, path):
         path = self._fix_path(path)
         if self._get_kind(path) != NodeKind.FILE:
             raise ChangesetError("File does not exist for revision %r at "
                 " %r" % (self.raw_id, path))
             raise ChangesetError("File does not exist for revision %s at "
                 " '%s'" % (self.raw_id, path))
         return self._ctx.filectx(path)
     def _extract_submodules(self):
         """
         returns a dictionary with submodule information from substate file
         of hg repository
@@ @@ -297,14 +297,14 @@ class MercurialChangeset(BaseChangeset): @@
         Returns combined ``DirNode`` and ``FileNode`` objects list representing
         state of changeset at the given ``path``. If node at the given ``path``
         is not instance of ``DirNode``, ChangesetError would be raised.
         """
         if self._get_kind(path) != NodeKind.DIR:
             raise ChangesetError("Directory does not exist for revision %r at "
                 " %r" % (self.revision, path))
             raise ChangesetError("Directory does not exist for revision %s at "
                 " '%s'" % (self.revision, path))
         path = self._fix_path(path)
         filenodes = [FileNode(f, changeset=self) for f in self._file_paths
             if os.path.dirname(f) == path]
         dirs = path == '' and '' or [d for d in self._dir_paths
             if d and posixpath.dirname(d) == path]
@@ @@ -341,13 +341,13 @@ class MercurialChangeset(BaseChangeset): @@
                 if path == '':
                     node = RootNode(changeset=self)
                 else:
                     node = DirNode(path, changeset=self)
             else:
                 raise NodeDoesNotExistError("There is no file nor directory "
-                    "at the given path: %r at revision %r"
+                    "at the given path: '%s' at revision %s"
                     % (path, self.short_id))
             # cache node
             self.nodes[path] = node
         return self.nodes[path]
     @LazyProperty

rhodecode/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -401,13 +401,13 @@ class MercurialRepository(BaseRepository @@
         if revision in [-1, 'tip', None]:
             revision = 'tip'
         try:
             revision = hex(self._repo.lookup(revision))
         except (IndexError, ValueError, RepoLookupError, TypeError):
-            raise ChangesetDoesNotExistError("Revision %r does not "
+            raise ChangesetDoesNotExistError("Revision %s does not "
                                     "exist for this repository"
                                     % (revision))
         return revision
     def _get_archives(self, archive_name='tip'):
         allowed = self.baseui.configlist("web", "allow_archive",

rhodecode/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -288,13 +288,13 @@ removed extra unicode conversion in diff @@
         response = self.app.get(url(controller='files', action='rawfile',
                                     repo_name=HG_REPO,
                                     revision=rev,
                                     f_path=f_path))
-        msg = """Revision %r does not exist for this repository""" % (rev)
+        msg = """Revision %s does not exist for this repository""" % (rev)
         self.checkSessionFlash(response, msg)
         self.assertEqual('http://localhost/%s/files/tip/' % HG_REPO, response.headers['location'])
     def test_raw_file_wrong_f_path(self):
         self.log_user()
@@ @@ -302,13 +302,13 @@ removed extra unicode conversion in diff @@
         f_path = 'vcs/ERRORnodes.py'
         response = self.app.get(url(controller='files', action='rawfile',
                                     repo_name=HG_REPO,
                                     revision=rev,
                                     f_path=f_path))
-        msg = "There is no file nor directory at the given path: %r at revision %r" % (f_path, rev[:12])
+        msg = "There is no file nor directory at the given path: '%s' at revision %s" % (f_path, rev[:12])
         self.checkSessionFlash(response, msg)
     #==========================================================================
     # RAW RESPONSE - PLAIN
     #==========================================================================
     def test_raw_ok(self):
@@ @@ -326,26 +326,26 @@ removed extra unicode conversion in diff @@
         f_path = 'vcs/nodes.py'
         response = self.app.get(url(controller='files', action='raw',
                                     repo_name=HG_REPO,
                                     revision=rev,
                                     f_path=f_path))
-        msg = """Revision %r does not exist for this repository""" % (rev)
+        msg = """Revision %s does not exist for this repository""" % (rev)
         self.checkSessionFlash(response, msg)
         self.assertEqual('http://localhost/%s/files/tip/' % HG_REPO, response.headers['location'])
     def test_raw_wrong_f_path(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
         f_path = 'vcs/ERRORnodes.py'
         response = self.app.get(url(controller='files', action='raw',
                                     repo_name=HG_REPO,
                                     revision=rev,
                                     f_path=f_path))
-        msg = "There is no file nor directory at the given path: %r at revision %r" % (f_path, rev[:12])
+        msg = "There is no file nor directory at the given path: '%s' at revision %s" % (f_path, rev[:12])
         self.checkSessionFlash(response, msg)
     def test_ajaxed_files_list(self):
         self.log_user()
         rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'
         response = self.app.get(

0 comments (0 inline, 0 general)