infocalypse

(djk)
2009-10-02: Workaround for hg-git bug. The hg-git extension breaks pulling from

Workaround for hg-git bug. The hg-git extension breaks pulling from bundle files somehow. In pull_bundle I backed out some old (for 1.0.2?) code that was doing an hg pull of the temp bundle files and changed it to do an hg unbundle instead.

diff --git a/infocalypse/graph.py b/infocalypse/graph.py
--- a/infocalypse/graph.py
+++ b/infocalypse/graph.py
@@ -90,6 +90,11 @@ def pull_bundle(repo, ui_, bundle_file):
         bundle_file must be an absolute path.
     """
 
+    # Not 
+    commands.unbundle(ui_, repo, bundle_file, rev=[],
+                      force=None, update=None)
+    # Not required anymore, unbundle seems to work.
+    # 
     # REDFLAG: djk20090319, is this still an issue?
     # IMPORTANT:
     # You must be in the repository root directory in order to pull
@@ -99,13 +104,13 @@ def pull_bundle(repo, ui_, bundle_file):
     #
     # MUST use --cwd
     # MUST use an absolute path for the bundle field
-    prev_cwd = os.getcwd()
-    os.chdir(repo.root)
-    try:
-        commands.pull(ui_, repo, bundle_file, rev=[],
-                      force=None, update=None)
-    finally:
-        os.chdir(prev_cwd)
+    #prev_cwd = os.getcwd()
+    #os.chdir(repo.root)
+    #try:
+    #    commands.pull(ui_, repo, bundle_file, rev=[],
+    #                  force=None, update=None)
+    #finally:
+    #    os.chdir(prev_cwd)
 
 ############################################################