Mercurial > kallithea
changeset 3575:ca7785fae354 beta
avoid %r markup of unicode strings in user facing messages
Improves
Revision u'b7f4...' does not exist for this repository
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 20 Mar 2013 15:32:23 +0100 |
| parents | 000653f7cdf9 |
| children | c177f304eb40 |
| files | 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 |
| diffstat | 6 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/utils.py Thu Mar 21 11:17:01 2013 +0100 +++ b/rhodecode/lib/utils.py Wed Mar 20 15:32:23 2013 +0100 @@ -768,7 +768,7 @@ 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 '
--- a/rhodecode/lib/vcs/backends/git/changeset.py Thu Mar 21 11:17:01 2013 +0100 +++ b/rhodecode/lib/vcs/backends/git/changeset.py Wed Mar 20 15:32:23 2013 +0100 @@ -153,7 +153,7 @@ 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] @@ -167,8 +167,8 @@ 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): @@ -394,8 +394,8 @@ 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] @@ -458,7 +458,7 @@ 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
--- a/rhodecode/lib/vcs/backends/git/repository.py Thu Mar 21 11:17:01 2013 +0100 +++ b/rhodecode/lib/vcs/backends/git/repository.py Wed Mar 20 15:32:23 2013 +0100 @@ -267,7 +267,7 @@ 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): @@ -282,12 +282,12 @@ 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
--- a/rhodecode/lib/vcs/backends/hg/changeset.py Thu Mar 21 11:17:01 2013 +0100 +++ b/rhodecode/lib/vcs/backends/hg/changeset.py Wed Mar 20 15:32:23 2013 +0100 @@ -174,14 +174,14 @@ 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): @@ -300,8 +300,8 @@ """ 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 @@ -344,7 +344,7 @@ 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
--- a/rhodecode/lib/vcs/backends/hg/repository.py Thu Mar 21 11:17:01 2013 +0100 +++ b/rhodecode/lib/vcs/backends/hg/repository.py Wed Mar 20 15:32:23 2013 +0100 @@ -404,7 +404,7 @@ 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
--- a/rhodecode/tests/functional/test_files.py Thu Mar 21 11:17:01 2013 +0100 +++ b/rhodecode/tests/functional/test_files.py Wed Mar 20 15:32:23 2013 +0100 @@ -291,7 +291,7 @@ 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']) @@ -305,7 +305,7 @@ 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) #========================================================================== @@ -329,7 +329,7 @@ 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']) @@ -342,7 +342,7 @@ 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):