{"thread":{"id":"21420","subject":"[PATCH 1/7] Refactor git_remote_cvs to a more generic git_remote_helpers","startedAt":"2009-10-29T15:47:21Z","lastAt":"2009-10-29T15:47:21Z","messageCount":1,"participants":["Sverre Rabbelier"],"isPatch":true,"patchVersion":1,"patchTotal":7},"messages":[{"id":"126281","messageId":"1256831241-3309-1-git-send-email-srabbelier@gmail.com","threadId":"21420","inReplyTo":null,"subject":"[PATCH 1/7] Refactor git_remote_cvs to a more generic git_remote_helpers","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-10-29T15:47:21Z","receivedAt":"2009-10-29T15:47:21Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"This in an effort to allow future remote helpers written in python to\nre-use the non-cvs-specific code.\n\nSigned-off-by: Sverre Rabbelier <srabbelier@gmail.com>\nCC: Johan Herland <johan@herland.net>\n---\n\n\tAs discussed with Johan Herland, refactored git_remote_cvs into a\n\tmore reusable git_remote_helpers module.\n\n\tResent as apparently I forgot to include '-C -M' in my\n\t'git format-patch' alias.\n\n Makefile                                           |    8 +++---\n git-remote-cvs.py                                  |   14 +++++-----\n git_remote_cvs/__init__.py                         |   27 --------------------\n git_remote_cvs/setup.py                            |   17 ------------\n {git_remote_cvs => git_remote_helpers}/.gitignore  |    0\n {git_remote_cvs => git_remote_helpers}/Makefile    |    2 +-\n git_remote_helpers/__init__.py                     |   27 ++++++++++++++++++++\n .../cvs}/changeset.py                              |    2 +-\n .../cvs}/commit_states.py                          |    4 +-\n {git_remote_cvs => git_remote_helpers/cvs}/cvs.py  |    6 ++--\n .../cvs/revision_map.py                            |    6 ++--\n .../cvs/symbol_cache.py                            |    4 +-\n {git_remote_cvs => git_remote_helpers/git}/git.py  |    4 +-\n git_remote_helpers/setup.py                        |   17 ++++++++++++\n {git_remote_cvs => git_remote_helpers}/util.py     |    0\n t/test-lib.sh                                      |    4 +-\n 16 files changed, 71 insertions(+), 71 deletions(-)\n delete mode 100644 git_remote_cvs/__init__.py\n delete mode 100644 git_remote_cvs/setup.py\n rename {git_remote_cvs => git_remote_helpers}/.gitignore (100%)\n rename {git_remote_cvs => git_remote_helpers}/Makefile (92%)\n create mode 100644 git_remote_helpers/__init__.py\n create mode 100644 git_remote_helpers/cvs/__init__.py\n rename {git_remote_cvs => git_remote_helpers/cvs}/changeset.py (98%)\n rename {git_remote_cvs => git_remote_helpers/cvs}/commit_states.py (95%)\n rename {git_remote_cvs => git_remote_helpers/cvs}/cvs.py (99%)\n rename git_remote_cvs/cvs_revision_map.py => git_remote_helpers/cvs/revision_map.py (98%)\n rename git_remote_cvs/cvs_symbol_cache.py => git_remote_helpers/cvs/symbol_cache.py (98%)\n create mode 100644 git_remote_helpers/git/__init__.py\n rename {git_remote_cvs => git_remote_helpers/git}/git.py (99%)\n create mode 100644 git_remote_helpers/setup.py\n rename {git_remote_cvs => git_remote_helpers}/util.py (100%)\n\ndiff --git a/Makefile b/Makefile\nindex 21da297..fa3f768 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1335,7 +1335,7 @@ ifndef NO_PERL\n \t$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all\n endif\n ifndef NO_PYTHON\n-\t$(QUIET_SUBDIR0)git_remote_cvs $(QUIET_SUBDIR1) PYTHON_PATH='$(PYTHON_PATH_SQ)' prefix='$(prefix_SQ)' all\n+\t$(QUIET_SUBDIR0)git_remote_helpers $(QUIET_SUBDIR1) PYTHON_PATH='$(PYTHON_PATH_SQ)' prefix='$(prefix_SQ)' all\n endif\n \t$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)\n \n@@ -1459,7 +1459,7 @@ ifndef NO_PYTHON\n $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS\n $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n-\tINSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_cvs -s \\\n+\tINSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \\\n \t\t--no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \\\n \t\tinstlibdir` && \\\n \tsed -e '1{' \\\n@@ -1709,7 +1709,7 @@ ifndef NO_PERL\n \t$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install\n endif\n ifndef NO_PYTHON\n-\t$(MAKE) -C git_remote_cvs prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install\n+\t$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install\n endif\n ifndef NO_TCLTK\n \t$(MAKE) -C gitk-git install\n@@ -1826,7 +1826,7 @@ ifndef NO_PERL\n \t$(MAKE) -C perl clean\n endif\n ifndef NO_PYTHON\n-\t$(MAKE) -C git_remote_cvs clean\n+\t$(MAKE) -C git_remote_helpers clean\n endif\n \t$(MAKE) -C templates/ clean\n \t$(MAKE) -C t/ clean\ndiff --git a/git-remote-cvs.py b/git-remote-cvs.py\nindex 94b61e7..f322f96 100755\n--- a/git-remote-cvs.py\n+++ b/git-remote-cvs.py\n@@ -36,16 +36,16 @@ configuration details of this remote helper.\n import sys\n import os\n \n-from git_remote_cvs.util import (debug, error, die, ProgressIndicator,\n+from git_remote_helpers.util import (debug, error, die, ProgressIndicator,\n                                  run_command)\n-from git_remote_cvs.cvs import CVSState, CVSWorkDir, fetch_revs\n-from git_remote_cvs.git import (get_git_dir, parse_git_config, git_config_bool,\n+from git_remote_helpers.cvs.cvs import CVSState, CVSWorkDir, fetch_revs\n+from git_remote_helpers.git.git import (get_git_dir, parse_git_config, git_config_bool,\n                                 valid_git_ref, GitObjectFetcher, GitRefMap,\n                                 GitFICommit, GitFastImport, GitNotes)\n-from git_remote_cvs.cvs_symbol_cache import CVSSymbolCache\n-from git_remote_cvs.commit_states import CommitStates\n-from git_remote_cvs.cvs_revision_map import CVSRevisionMap, CVSStateMap\n-from git_remote_cvs.changeset import build_changesets_from_revs\n+from git_remote_helpers.cvs.symbol_cache import CVSSymbolCache\n+from git_remote_helpers.cvs.commit_states import CommitStates\n+from git_remote_helpers.cvs.revision_map import CVSRevisionMap, CVSStateMap\n+from git_remote_helpers.cvs.changeset import build_changesets_from_revs\n \n \n class Config(object):\ndiff --git a/git_remote_cvs/__init__.py b/git_remote_cvs/__init__.py\ndeleted file mode 100644\nindex 4956d2d..0000000\n--- a/git_remote_cvs/__init__.py\n+++ /dev/null\n@@ -1,27 +0,0 @@\n-#!/usr/bin/env python\n-\n-\"\"\"Support library package for git-remote-cvs.\n-\n-git-remote-cvs is a Git remote helper command that interfaces with a\n-CVS repository to provide automatic import of CVS history into a Git\n-repository.\n-\n-This package provides the support library needed by git-remote-cvs.\n-The following modules are included:\n-\n-- cvs - Interaction with CVS repositories\n-\n-- cvs_symbol_cache - Local CVS symbol cache\n-\n-- changeset - Collect individual CVS revisions into commits\n-\n-- git - Interaction with Git repositories\n-\n-- commit_states - Map Git commits to CVS states\n-\n-- cvs_revision_map - Map CVS revisions to various metainformation\n-\n-- util - General utility functionality use by the other modules in\n-         this package, and also used directly by git-remote-cvs.\n-\n-\"\"\"\ndiff --git a/git_remote_cvs/setup.py b/git_remote_cvs/setup.py\ndeleted file mode 100644\nindex 21f521a..0000000\n--- a/git_remote_cvs/setup.py\n+++ /dev/null\n@@ -1,17 +0,0 @@\n-#!/usr/bin/env python\n-\n-\"\"\"Distutils build/install script for the git_remote_cvs package.\"\"\"\n-\n-from distutils.core import setup\n-\n-setup(\n-    name = 'git_remote_cvs',\n-    version = '0.1.0',\n-    description = 'Git remote helper program for CVS repositories',\n-    license = 'GPLv2',\n-    author = 'The Git Community',\n-    author_email = 'git@vger.kernel.org',\n-    url = 'http://www.git-scm.com/',\n-    package_dir = {'git_remote_cvs': ''},\n-    packages = ['git_remote_cvs'],\n-)\ndiff --git a/git_remote_cvs/.gitignore b/git_remote_helpers/.gitignore\nsimilarity index 100%\nrename from git_remote_cvs/.gitignore\nrename to git_remote_helpers/.gitignore\ndiff --git a/git_remote_cvs/Makefile b/git_remote_helpers/Makefile\nsimilarity index 92%\nrename from git_remote_cvs/Makefile\nrename to git_remote_helpers/Makefile\nindex 0d9eb31..c62dfd0 100644\n--- a/git_remote_cvs/Makefile\n+++ b/git_remote_helpers/Makefile\n@@ -1,5 +1,5 @@\n #\n-# Makefile for the git_remote_cvs python support modules\n+# Makefile for the git_remote_helpers python support modules\n #\n pysetupfile:=setup.py\n \ndiff --git a/git_remote_helpers/__init__.py b/git_remote_helpers/__init__.py\nnew file mode 100644\nindex 0000000..38c7b5f\n--- /dev/null\n+++ b/git_remote_helpers/__init__.py\n@@ -0,0 +1,27 @@\n+#!/usr/bin/env python\n+\n+\"\"\"Support library package for git remote helpers.\n+\n+Git remote helpers are helper commands that interfaces with a non-git\n+repository to provide automatic import of non-git history into a Git\n+repository.\n+\n+This package provides the support library needed by these helpers..\n+The following modules are included:\n+\n+- cvs/cvs - Interaction with CVS repositories\n+\n+- cvs/symbol_cache - Local CVS symbol cache\n+\n+- cvs/changeset - Collect individual CVS revisions into commits\n+\n+- cvs/commit_states - Map Git commits to CVS states\n+\n+- cvs/revision_map - Map CVS revisions to various metainformation\n+\n+- git/git - Interaction with Git repositories\n+\n+- util - General utility functionality use by the other modules in\n+         this package, and also used directly by git-remote-cvs.\n+\n+\"\"\"\ndiff --git a/git_remote_helpers/cvs/__init__.py b/git_remote_helpers/cvs/__init__.py\nnew file mode 100644\nindex 0000000..e69de29\ndiff --git a/git_remote_cvs/changeset.py b/git_remote_helpers/cvs/changeset.py\nsimilarity index 98%\nrename from git_remote_cvs/changeset.py\nrename to git_remote_helpers/cvs/changeset.py\nindex 9eea9d2..4865c37 100644\n--- a/git_remote_cvs/changeset.py\n+++ b/git_remote_helpers/cvs/changeset.py\n@@ -11,7 +11,7 @@ module tries to reconstruct this notion of related revisions.\n \n \"\"\"\n \n-from git_remote_cvs.util import debug, error, die\n+from git_remote_helpers.util import debug, error, die\n \n \n class Changeset(object):\ndiff --git a/git_remote_cvs/commit_states.py b/git_remote_helpers/cvs/commit_states.py\nsimilarity index 95%\nrename from git_remote_cvs/commit_states.py\nrename to git_remote_helpers/cvs/commit_states.py\nindex 2e0af6c..a796bb1 100644\n--- a/git_remote_cvs/commit_states.py\n+++ b/git_remote_helpers/cvs/commit_states.py\n@@ -2,8 +2,8 @@\n \n \"\"\"Code for relating Git commits to corresponding CVSState objects.\"\"\"\n \n-from git_remote_cvs.util import debug, error, die\n-from git_remote_cvs.cvs import CVSState\n+from git_remote_helpers.util import debug, error, die\n+from git_remote_helpers.cvs.cvs import CVSState\n \n \n class CommitStates(object):\ndiff --git a/git_remote_cvs/cvs.py b/git_remote_helpers/cvs/cvs.py\nsimilarity index 99%\nrename from git_remote_cvs/cvs.py\nrename to git_remote_helpers/cvs/cvs.py\nindex f870ae0..a1a02be 100644\n--- a/git_remote_cvs/cvs.py\n+++ b/git_remote_helpers/cvs/cvs.py\n@@ -17,9 +17,9 @@ import time\n from calendar import timegm\n import unittest\n \n-from git_remote_cvs.util import (debug, error, die, ProgressIndicator,\n-                                 start_command, run_command,\n-                                 file_reader_method, file_writer_method)\n+from git_remote_helpers.util import (debug, error, die, ProgressIndicator,\n+                                     start_command, run_command,\n+                                     file_reader_method, file_writer_method)\n \n \n class CVSNum(object):\ndiff --git a/git_remote_cvs/cvs_revision_map.py b/git_remote_helpers/cvs/revision_map.py\nsimilarity index 98%\nrename from git_remote_cvs/cvs_revision_map.py\nrename to git_remote_helpers/cvs/revision_map.py\nindex 0e65ba6..b7b17bc 100644\n--- a/git_remote_cvs/cvs_revision_map.py\n+++ b/git_remote_helpers/cvs/revision_map.py\n@@ -18,9 +18,9 @@ CVSStateMap - provides a mapping from CVS states to corresponding\n \n import os\n \n-from git_remote_cvs.util import debug, error, die, file_reader_method\n-from git_remote_cvs.cvs import CVSNum, CVSDate\n-from git_remote_cvs.git import GitFICommit\n+from git_remote_helpers.util import debug, error, die, file_reader_method\n+from git_remote_helpers.cvs.cvs import CVSNum, CVSDate\n+from git_remote_helpers.git.git import GitFICommit\n \n \n class _CVSPathInfo(object):\ndiff --git a/git_remote_cvs/cvs_symbol_cache.py b/git_remote_helpers/cvs/symbol_cache.py\nsimilarity index 98%\nrename from git_remote_cvs/cvs_symbol_cache.py\nrename to git_remote_helpers/cvs/symbol_cache.py\nindex cc8d88b..6bd1715 100644\n--- a/git_remote_cvs/cvs_symbol_cache.py\n+++ b/git_remote_helpers/cvs/symbol_cache.py\n@@ -23,8 +23,8 @@ synchronizing _all_ CVS symbols in one operation (by executing\n import sys\n import os\n \n-from git_remote_cvs.util import debug, error, die, ProgressIndicator\n-from git_remote_cvs.cvs import CVSNum, CVSState, CVSLogParser\n+from git_remote_helpers.util import debug, error, die, ProgressIndicator\n+from git_remote_helpers.cvs.cvs import CVSNum, CVSState, CVSLogParser\n \n \n class CVSSymbolStateLister(CVSLogParser):\ndiff --git a/git_remote_helpers/git/__init__.py b/git_remote_helpers/git/__init__.py\nnew file mode 100644\nindex 0000000..e69de29\ndiff --git a/git_remote_cvs/git.py b/git_remote_helpers/git/git.py\nsimilarity index 99%\nrename from git_remote_cvs/git.py\nrename to git_remote_helpers/git/git.py\nindex cf037e3..8e1bc77 100644\n--- a/git_remote_cvs/git.py\n+++ b/git_remote_helpers/git/git.py\n@@ -12,8 +12,8 @@ from binascii import hexlify\n from cStringIO import StringIO\n import unittest\n \n-from git_remote_cvs.util import debug, error, die, start_command, run_command\n-from git_remote_cvs.cvs import CVSDate\n+from git_remote_helpers.util import debug, error, die, start_command, run_command\n+from git_remote_helpers.cvs.cvs import CVSDate\n \n \n def get_git_dir ():\ndiff --git a/git_remote_helpers/setup.py b/git_remote_helpers/setup.py\nnew file mode 100644\nindex 0000000..327f0ff\n--- /dev/null\n+++ b/git_remote_helpers/setup.py\n@@ -0,0 +1,17 @@\n+#!/usr/bin/env python\n+\n+\"\"\"Distutils build/install script for the git_remote_helpers package.\"\"\"\n+\n+from distutils.core import setup\n+\n+setup(\n+    name = 'git_remote_helpers',\n+    version = '0.1.0',\n+    description = 'Git remote helper program for non-git repositories',\n+    license = 'GPLv2',\n+    author = 'The Git Community',\n+    author_email = 'git@vger.kernel.org',\n+    url = 'http://www.git-scm.com/',\n+    package_dir = {'git_remote_helpers': ''},\n+    packages = ['git_remote_helpers', 'git_remote_helpers.git', 'git_remote_helpers.cvs'],\n+)\ndiff --git a/git_remote_cvs/util.py b/git_remote_helpers/util.py\nsimilarity index 100%\nrename from git_remote_cvs/util.py\nrename to git_remote_helpers/util.py\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 5cd2b1c..20216a5 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -637,9 +637,9 @@ test -d ../templates/blt || {\n \n if test -z \"$GIT_TEST_INSTALLED\"\n then\n-\tGITPYTHONLIB=\"$(pwd)/../git_remote_cvs/build/lib\"\n+\tGITPYTHONLIB=\"$(pwd)/../git_remote_helpers/build/lib\"\n \texport GITPYTHONLIB\n-\ttest -d ../git_remote_cvs/build || {\n+\ttest -d ../git_remote_helpers/build || {\n \t\terror \"You haven't built git_remote_cvs yet, have you?\"\n \t}\n fi\n-- \n1.6.5.2.291.gf76a3\n"}]}