Commits

Dan Villiom Podlaski Christiansen committed fbc5adc

Rebased.

Comments (0)

Files changed (5)

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1281451447 -7200
-# Node ID 7544b19509ab8e5258bb229a43fc12e45e4bece5
-# Parent  1310edf02d5da3052e5ed47cdc3998d834403cbd
+# Node ID a98a4c6ae71ac39e826bfe81fe28e22f61cb8b17
+# Parent  b6d9a3115548fa3caaa4f678fb9b7be15ad4a9e5
 create repository folder if it doesn't exist
 
 diff --git a/hgit/__init__.py b/hgit/__init__.py
 --- a/hgit/__init__.py
 +++ b/hgit/__init__.py
-@@ -63,6 +63,8 @@ def gitinit(orig, ui, dest='.', **opts):
+@@ -46,6 +46,8 @@ def gitinit(orig, ui, dest='.', **opts):
          if gr is None:
              # create a new git repo
              path = os.path.abspath(dest)
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1281451271 -7200
-# Node ID 1310edf02d5da3052e5ed47cdc3998d834403cbd
-# Parent  ef48fab88fbc7a21a21fbef567ddb7050669bd09
+# Node ID b6d9a3115548fa3caaa4f678fb9b7be15ad4a9e5
+# Parent  534a8fa6fe982d37bdad35c1cda0ffb59f5dd928
 add missing EOL to call to ui.warn()
 
 diff --git a/hgit/__init__.py b/hgit/__init__.py
 --- a/hgit/__init__.py
 +++ b/hgit/__init__.py
-@@ -66,7 +66,7 @@ def gitinit(orig, ui, dest='.', **opts):
+@@ -49,7 +49,7 @@ def gitinit(orig, ui, dest='.', **opts):
              r = dulrepo.Repo.init(path)
          dothg = os.path.join(path, '.hg')
          if os.path.exists(dothg):

missing-import.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1281451228 -7200
-# Node ID ef48fab88fbc7a21a21fbef567ddb7050669bd09
-# Parent  b6dfaf841c782c8173f878eb56b7c0213a0b0001
+# Node ID 534a8fa6fe982d37bdad35c1cda0ffb59f5dd928
+# Parent  20e50149c6c26816a6792b6288a46bcb41d0fe23
 add a missing import
 
 diff --git a/hgit/__init__.py b/hgit/__init__.py
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1281451484 -7200
-# Node ID e0a64e96476373df882cc8e0d00c313d98982760
-# Parent  7544b19509ab8e5258bb229a43fc12e45e4bece5
+# Node ID edda924049d30293cac113dad60c2656c6094f7d
+# Parent  a98a4c6ae71ac39e826bfe81fe28e22f61cb8b17
 gitdirstate: handle empty repositories
 
 diff --git a/hgit/gitdirstate.py b/hgit/gitdirstate.py
 --- a/hgit/gitdirstate.py
 +++ b/hgit/gitdirstate.py
-@@ -19,7 +19,10 @@ class gitdirstate(dirstate.dirstate):
+@@ -20,7 +20,10 @@ class gitdirstate(dirstate.dirstate):
  
      def parents(self):
          # TODO handle merge state
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1281451746 -7200
-# Node ID b8863506b7b47666ff05716d5cdddc59dd394046
-# Parent  e0a64e96476373df882cc8e0d00c313d98982760
+# Node ID 80c9089552416a24c79f01a65a96696c9e0e3909
+# Parent  edda924049d30293cac113dad60c2656c6094f7d
 gitrepo/gitinit: add a requirement to hgit repositories
 
 Before this patch, an hgit repository would be considered a valid, but
 diff --git a/hgit/__init__.py b/hgit/__init__.py
 --- a/hgit/__init__.py
 +++ b/hgit/__init__.py
-@@ -73,6 +73,9 @@ def gitinit(orig, ui, dest='.', **opts):
+@@ -56,6 +56,9 @@ def gitinit(orig, ui, dest='.', **opts):
              os.mkdir(os.path.join(path, '.hg'))
          f = open(os.path.join(dothg, 'this-is-git'), 'w')
          f.close()
 diff --git a/hgit/gitrepo.py b/hgit/gitrepo.py
 --- a/hgit/gitrepo.py
 +++ b/hgit/gitrepo.py
-@@ -15,8 +15,8 @@ import cache
+@@ -16,8 +16,8 @@ import cache
  import gitdirstate
  
  class localgitrepo(localrepo.localrepository):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.