Mercurial > hg > hg-git

changeset 17:ace0f6ed65a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setting up for upload-pack functionality
author Scott Chacon <schacon@gmail.com>
date Sun, 26 Apr 2009 17:56:16 -0700
parents 58cd05129119
children feab56c76c92
files __init__.py git_handler.py
diffstat 2 files changed, 20 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/__init__.py
+++ b/__init__.py
@@ -44,9 +44,9 @@
     node = git.remote_head('origin')
     hg.update(dest_repo, node)
 
-def gpush(ui, repo, remote_name):
-    # determine new repo name
-    dest_repo.ui.status(_("pushing to git url\n"))
+def gpush(ui, repo, remote_name='origin'):
+    git = GitHandler(repo, ui)
+    git.push(remote_name)
     
 def gpull(ui, repo):
     dest_repo.ui.status(_("pulling from git url\n"))
@@ -60,9 +60,9 @@
        'Clone a git repository into an hg repository.',
        ),
   "gpush":
-        (gpush,
-         [('m', 'merge', None, _('merge automatically'))],
-         _('hg gpush remote')),
+        (gpush, [], _('hg gpush remote')),
   "gpull":
-        (gpull, [], _('hg gpull [--merge] remote')),
+        (gpull, 
+        [('m', 'merge', None, _('merge automatically'))],
+        _('hg gpull [--merge] remote')),
 }    
--- a/git_handler.py
+++ b/git_handler.py
@@ -18,11 +18,12 @@
         self.load_map()
         self.load_config()
         
+    # make the git data directory        
     def init_if_missing(self):
-        # make the git data directory
         git_hg_path = os.path.join(self.repo.path, 'git')
-        os.mkdir(git_hg_path)
-        dulwich.repo.Repo.init_bare(git_hg_path)
+        if not os.path.exists(git_hg_path):
+            os.mkdir(git_hg_path)
+            dulwich.repo.Repo.init_bare(git_hg_path)
     
     def load_git(self):
         git_dir = os.path.join(self.repo.path, 'git')
@@ -66,6 +67,12 @@
         self.import_git_objects(remote_name)
         self.save_map()
 
+    def push(self, remote_name):
+        self.ui.status(_("pushing to : " + remote_name + "\n"))
+        self.export_git_objects()
+        self.upload_pack(remote_name)
+        self.save_map()
+        
     # TODO: make these actually save and recall
     def remote_add(self, remote_name, git_url):
         self._config['remote.' + remote_name + '.url'] = git_url
@@ -79,6 +86,9 @@
             if head == 'HEAD':
                 return self._map[sha]
         return None
+    
+    def upload_pack(self, remote_name):
+        self.ui.status(_("upload pack\n"))
         
     def fetch_pack(self, remote_name):
         git_url = self.remote_name_to_url(remote_name)