Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E113010A25 for ; Fri, 4 Oct 2013 18:07:25 +0000 (UTC) Received: (qmail 9170 invoked by uid 500); 4 Oct 2013 18:07:04 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 8372 invoked by uid 500); 4 Oct 2013 18:06:49 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 7844 invoked by uid 99); 4 Oct 2013 18:06:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Oct 2013 18:06:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F306790FD64; Fri, 4 Oct 2013 18:06:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Fri, 04 Oct 2013 18:07:13 -0000 Message-Id: <1d328dadbc3e41c1b0aab9025311a10d@git.apache.org> In-Reply-To: <993a97b4580a48b1ad927835881f2bdd@git.apache.org> References: <993a97b4580a48b1ad927835881f2bdd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/50] git commit: [#6534] ticket:441 Convert page names [#6534] ticket:441 Convert page names Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/26fecece Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/26fecece Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/26fecece Branch: refs/heads/cj/6692 Commit: 26fecece1e63c672cceca03530484b4fb9318f1c Parents: 2b1f3c0 Author: Igor Bondarenko Authored: Fri Sep 20 12:45:06 2013 +0300 Committer: Dave Brondsema Committed: Fri Oct 4 14:21:22 2013 +0000 ---------------------------------------------------------------------- ForgeImporters/forgeimporters/github/tests/test_wiki.py | 6 ++++++ ForgeImporters/forgeimporters/github/wiki.py | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/26fecece/ForgeImporters/forgeimporters/github/tests/test_wiki.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/forgeimporters/github/tests/test_wiki.py b/ForgeImporters/forgeimporters/github/tests/test_wiki.py index 01dec62..88e42d7 100644 --- a/ForgeImporters/forgeimporters/github/tests/test_wiki.py +++ b/ForgeImporters/forgeimporters/github/tests/test_wiki.py @@ -128,6 +128,12 @@ class TestGitHubWikiImporter(TestCase): assert_equal(upsert.call_args_list, [call('Home')]) assert_equal(render.call_args_list, [call('Home.md', u'# test message')]) + def test_convert_page_name(self): + f = GitHubWikiImporter()._convert_page_name + assert_equal(f('Page Name'), 'Page Name') + assert_equal(f('Page-Name'), 'Page Name') + assert_equal(f('Page / Name'), 'Page Name') + def test_convert_gollum_page_links(self): f = GitHubWikiImporter().convert_gollum_page_links assert_equal(f(u'[[Page]]'), u'[Page]') http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/26fecece/ForgeImporters/forgeimporters/github/wiki.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/forgeimporters/github/wiki.py b/ForgeImporters/forgeimporters/github/wiki.py index 11fb50b..bc82ac8 100644 --- a/ForgeImporters/forgeimporters/github/wiki.py +++ b/ForgeImporters/forgeimporters/github/wiki.py @@ -187,6 +187,7 @@ class GitHubWikiImporter(ToolImporter): log.info('Not a wiki page %s. Skipping.' % filename) return mod_date = datetime.utcfromtimestamp(commit.committed_date) + name = self._convert_page_name(name) wiki_page = WM.Page.upsert(name) if filename in commit.tree: wiki_page.text = self.convert_markup(h.really_unicode(text), filename) @@ -199,6 +200,10 @@ class GitHubWikiImporter(ToolImporter): wiki_page.commit() return wiki_page + def _convert_page_name(self, name): + """Convert '-' and '/' into spaces in page name to match github behavior""" + return name.replace('-', ' ').replace('/', ' ') + def import_pages(self, wiki_url, history=None): wiki_path = mkdtemp() wiki = git.Repo.clone_from(wiki_url, to_path=wiki_path, bare=True) @@ -245,7 +250,7 @@ class GitHubWikiImporter(ToolImporter): \]\]) # tag end''', re.VERBOSE) def repl(match): - page = match.group('page').replace('-', ' ').replace('/', ' ') + page = self._convert_page_name(match.group('page')) title = match.groupdict().get('title') quote = match.groupdict().get('quote') if quote: