Mercurial > hg-git

changeset 206:5986ac6a591e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
create the repository subclass in reposetup hg-git should no longer conflict with hgsubversion
author Abderrahim Kitouni <a.kitouni@gmail.com>
date Wed, 01 Jul 2009 21:31:35 +0100
parents a3914d6a04a7
children c06ac5b982a9
files __init__.py gitrepo.py hgrepo.py
diffstat 3 files changed, 160 insertions(+), 159 deletions(-) [+]
line wrap: on
line diff
--- a/__init__.py	Tue Jun 30 15:29:40 2009 +0100
+++ b/__init__.py	Wed Jul 01 21:31:35 2009 +0100
@@ -28,11 +28,9 @@
 hg.schemes['git'] = gitrepo
 hg.schemes['git+ssh'] = gitrepo
 
-def _local(path):
-    return (os.path.isfile(util.drop_scheme('file', path)) and
-            bundlerepo or hgrepo)
-
-hg.schemes['file'] = _local
+def reposetup(ui, repo):
+    klass = hgrepo.generate_repo_subclass(repo.__class__)
+    repo.__class__ = klass
 
 def gimport(ui, repo, remote_name=None):
     git = GitHandler(repo, ui)
--- a/gitrepo.py	Tue Jun 30 15:29:40 2009 +0100
+++ b/gitrepo.py	Wed Jul 01 21:31:35 2009 +0100
@@ -2,6 +2,7 @@
 from git_handler import GitHandler
 
 class gitrepo(repo.repository):
+    capabilities = []
     def __init__(self, ui, path, create):
         if create:
             raise util.Abort('Cannot create a git repository.')
--- a/hgrepo.py	Tue Jun 30 15:29:40 2009 +0100
+++ b/hgrepo.py	Wed Jul 01 21:31:35 2009 +0100
@@ -6,172 +6,174 @@
 from gitrepo import gitrepo
 
 
-class hgrepo(localrepo.localrepository):
+def generate_repo_subclass(baseclass):
+    class hgrepo(baseclass):
+        def commit_import_ctx(self, wctx, ancestor, force_files = None):
 
-    def commit_import_ctx(self, wctx, ancestor, force_files = None):
-    
-        tr = None
-        valid = 0 # don't save the dirstate if this isn't set
-        try:
-            force=False
-            force_editor=False
-            empty_ok=False
-            use_dirstate=False
-            update_dirstate=False
-            
-            commit = sorted(wctx.modified() + wctx.added())
-            remove = wctx.removed()
-            extra = wctx.extra().copy()
-            branchname = extra['branch']
-            user = wctx.user()
-            text = wctx.description()
-
-            p1, p2 = [p.node() for p in wctx.parents()]
-            c1 = self.changelog.read(p1)
-            c2 = self.changelog.read(p2)
-            m1 = self.manifest.read(c1[0]).copy()
-            m2 = self.manifest.read(c2[0])
-            ma = None
-            if ancestor:
-                ma = ancestor.manifest()
-
-            xp1 = hex(p1)
-            if p2 == nullid: xp2 = ''
-            else: xp2 = hex(p2)
-
-            tr = self.transaction()
-            trp = weakref.proxy(tr)
+            tr = None
+            valid = 0 # don't save the dirstate if this isn't set
+            try:
+                force=False
+                force_editor=False
+                empty_ok=False
+                use_dirstate=False
+                update_dirstate=False
 
-            # looking for files that have not actually changed content-wise,
-            # but have different nodeids because they were changed and then
-            # reverted, so they have changed in the revlog.
-            for f in m1:
-                if (f in m2) and (not f in commit) and (not m1[f] == m2[f]):
-                    commit.append(f)
-                    
-            # check in files
-            new = {}
-            changed = []
-            linkrev = len(self)
-            for f in commit:
-                self.ui.note(f + "\n")
-                try:
-                    fctx = wctx.filectx(f)
-                    newflags = fctx.flags()
-                    try:
-                        new[f] = self.filecommit(fctx, m1, m2, linkrev, trp, changed)
-                    except AttributeError:
-                        new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, changed)
-                    if ((not changed or changed[-1] != f) and
-                        m2.get(f) != new[f]):
-                        # mention the file in the changelog if some
-                        # flag changed, even if there was no content
-                        # change.
-                        if m1.flags(f) != newflags:
-                            changed.append(f)
-                    m1.set(f, newflags)
+                commit = sorted(wctx.modified() + wctx.added())
+                remove = wctx.removed()
+                extra = wctx.extra().copy()
+                branchname = extra['branch']
+                user = wctx.user()
+                text = wctx.description()
 
-                except (OSError, IOError):
-                    remove.append(f)
-            
-            updated, added = [], []
-            for f in sorted(changed):
-                if f in m1 or f in m2:
-                    updated.append(f)
-                else:
-                    added.append(f)
-            
-            # update manifest
-            m1.update(new)
-            removed = [f for f in sorted(remove) if f in m1 or f in m2]
-            removed1 = []
+                p1, p2 = [p.node() for p in wctx.parents()]
+                c1 = self.changelog.read(p1)
+                c2 = self.changelog.read(p2)
+                m1 = self.manifest.read(c1[0]).copy()
+                m2 = self.manifest.read(c2[0])
+                ma = None
+                if ancestor:
+                    ma = ancestor.manifest()
 
-            for f in removed:
-                if f in m1:
-                    del m1[f]
-                    removed1.append(f)
+                xp1 = hex(p1)
+                if p2 == nullid:
+                    xp2 = ''
                 else:
-                    if ma and (f in ma):
-                        del ma[f]
-                        removed.remove(f)
-            
-            mn = self.manifest.add(m1, trp, linkrev, c1[0], c2[0],
-                                   (new, removed1))
+                    xp2 = hex(p2)
+
+                tr = self.transaction()
+                trp = weakref.proxy(tr)
+
+                # looking for files that have not actually changed content-wise,
+                # but have different nodeids because they were changed and then
+                # reverted, so they have changed in the revlog.
+                for f in m1:
+                    if (f in m2) and (not f in commit) and (not m1[f] == m2[f]):
+                        commit.append(f)
+
+                # check in files
+                new = {}
+                changed = []
+                linkrev = len(self)
+                for f in commit:
+                    self.ui.note(f + "\n")
+                    try:
+                        fctx = wctx.filectx(f)
+                        newflags = fctx.flags()
+                        try:
+                            new[f] = self.filecommit(fctx, m1, m2, linkrev, trp, changed)
+                        except AttributeError:
+                            new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, changed)
+                        if ((not changed or changed[-1] != f) and
+                            m2.get(f) != new[f]):
+                            # mention the file in the changelog if some
+                            # flag changed, even if there was no content
+                            # change.
+                            if m1.flags(f) != newflags:
+                                changed.append(f)
+                        m1.set(f, newflags)
 
-            #lines = [line.rstrip() for line in text.rstrip().splitlines()]
-            #while lines and not lines[0]:
-            #    del lines[0]
-            #text = '\n'.join(lines)
-            if text[-1] == "\n":
-                text = text[:-1]
-            
-            file_list = changed + removed
+                    except (OSError, IOError):
+                        remove.append(f)
+
+                updated, added = [], []
+                for f in sorted(changed):
+                    if f in m1 or f in m2:
+                        updated.append(f)
+                    else:
+                        added.append(f)
+
+                # update manifest
+                m1.update(new)
+                removed = [f for f in sorted(remove) if f in m1 or f in m2]
+                removed1 = []
+
+                for f in removed:
+                    if f in m1:
+                        del m1[f]
+                        removed1.append(f)
+                    else:
+                        if ma and (f in ma):
+                            del ma[f]
+                            removed.remove(f)
+
+                mn = self.manifest.add(m1, trp, linkrev, c1[0], c2[0],
+                                       (new, removed1))
+
+                #lines = [line.rstrip() for line in text.rstrip().splitlines()]
+                #while lines and not lines[0]:
+                #    del lines[0]
+                #text = '\n'.join(lines)
+                if text[-1] == "\n":
+                    text = text[:-1]
+
+                file_list = changed + removed
             
-            self.changelog.delayupdate()
-            n = self.changelog.add(mn, file_list, text, trp, p1, p2,
-                                   user, wctx.date(), extra)
-            p = lambda: self.changelog.writepending() and self.root or ""
-            self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
-                      parent2=xp2, pending=p)
-            self.changelog.finalize(trp)
-            tr.close()
-            
-            if self.branchcache:
-                self.branchtags()
+                self.changelog.delayupdate()
+                n = self.changelog.add(mn, file_list, text, trp, p1, p2,
+                                       user, wctx.date(), extra)
+                p = lambda: self.changelog.writepending() and self.root or ""
+                self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
+                          parent2=xp2, pending=p)
+                self.changelog.finalize(trp)
+                tr.close()
+
+                if self.branchcache:
+                    self.branchtags()
+
+                if update_dirstate:
+                    self.dirstate.setparents(n)
+                valid = 1 # our dirstate updates are complete
+
+                self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2)
+                return n
+            finally:
+                if not valid: # don't save our updated dirstate
+                    self.dirstate.invalidate()
+                del tr
 
-            if update_dirstate:
-                self.dirstate.setparents(n)
-            valid = 1 # our dirstate updates are complete
+        def pull(self, remote, heads=None, force=False):
+            if isinstance(remote, gitrepo):
+                git = GitHandler(self, self.ui)
+                git.fetch(remote.path)
+            else:
+                super(hgrepo, self).pull(remote, heads, force)
+
+        def push(self, remote, force=False, revs=None):
+            if isinstance(remote, gitrepo):
+                git = GitHandler(self, self.ui)
+                git.push(remote.path)
+            else:
+                super(hgrepo, self).push(remote, force, revs)
 
-            self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2)
-            return n
-        finally:
-            if not valid: # don't save our updated dirstate
-                self.dirstate.invalidate()
-            del tr
+        def tag(self, names, node, message, local, user, date):
+            if local:
+                super(hgrepo, self).tag(names, node, message, local, user, date)
+                return
 
-    def pull(self, remote, heads=None, force=False):
-        if isinstance(remote, gitrepo):
+            if isinstance(names, str):
+                names = (names,)
+
+            allchars = ''.join(names)
+            for c in self.tag_disallowed:
+                if c in allchars:
+                    raise util.Abort('%r cannot be used in a tag name' % c)
+
             git = GitHandler(self, self.ui)
-            git.fetch(remote.path)
-        else:
-            super(hgrepo, self).pull(remote, heads, force)
+            for name in names:
+                git.tags[name] = hex(node)
 
-    def push(self, remote, force=False, revs=None):
-        if isinstance(remote, gitrepo):
-            git = GitHandler(self, self.ui)
-            git.push(remote.path)
-        else:
-            super(hgrepo, self).push(remote, force, revs)
+            git.save_tags()
 
-    def tag(self, names, node, message, local, user, date):
-        if local:
-            super(hgrepo, self).tag(names, node, message, local, user, date)
-            return
-
-        if isinstance(names, str):
-            names = (names,)
+        def tags(self):
+            if self.tagscache:
+                return self.tagscache
 
-        allchars = ''.join(names)
-        for c in self.tag_disallowed:
-            if c in allchars:
-                raise util.Abort('%r cannot be used in a tag name' % c)
-
-        git = GitHandler(self, self.ui)
-        for name in names:
-            git.tags[name] = hex(node)
-
-        git.save_tags()
+            git = GitHandler(self, self.ui)
+            tagscache = super(hgrepo, self).tags()
+            tagscache.update(dict([(tag, bin(rev)) for (tag,rev) in git.tags.iteritems()]))
+            tagstypes = dict([(tag, 'git') for tag in git.tags])
+            self._tagstypecache.update(tagstypes)
+            return tagscache
 
-    def tags(self):
-        if self.tagscache:
-            return self.tagscache
-
-        git = GitHandler(self, self.ui)
-        tagscache = super(hgrepo, self).tags()
-        tagscache.update(dict([(tag, bin(rev)) for (tag,rev) in git.tags.iteritems()]))
-        tagstypes = dict([(tag, 'git') for tag in git.tags])
-        self._tagstypecache.update(tagstypes)
-        return tagscache
-
-instance = hgrepo
+    return hgrepo