* [PATCH v2] Add new remote-hg transport helper
@ 2012-10-20 15:00 Felipe Contreras
2012-10-20 15:43 ` Mike Hommey
0 siblings, 1 reply; 4+ messages in thread
From: Felipe Contreras @ 2012-10-20 15:00 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Sverre Rabbelier, Ilari Liusvaara,
Daniel Barkalow, Jeff King, Michael J Gruber, Felipe Contreras
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
I've looked at many hg<->git tools and none satisfy me. Too complicated, or too
slow, or to difficult to setup, etc.
The only one I've liked so far is hg-fast-export[1], which is indeed fast,
relatively simple, and relatively easy to use. But it's not properly maintained
any more.
So, I decided to write my own from scratch, using hg-fast-export as
inspiration, and voila.
This one doesn't have any dependencies, just put it into your $PATH, and you
can clone and fetch hg repositories. More importantly to me; the code is
simple, and easy to maintain.
One important remote-hg alternative is the one written by Sverre Rabbelier that
is now maintained and distributed in msysgit, however, in my opinion the code
is bloated, and there isn't even a standalone branch to take a look at the
patches, and give them a try.
This version has some features that Sverre's version doesn't:
* Support for tags
* Support to specify branchesto pull
Sverre's version has some features this one doesn't:
* Support for pushing
* Tests
[1] http://repo.or.cz/w/fast-export.git
Changes since v1:
* Improved documentation
* Use more common 'python' binary
* Warn, don't barf when a branch has multiple heads
* Fixed marks to fetch after cloned
* Support for cloning/pulling remote repositories
* Use a more appropriate internal directory (e.g. .git/hg/origin)
* Fixes for python3
contrib/remote-hg/git-remote-hg | 254 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 254 insertions(+)
create mode 100755 contrib/remote-hg/git-remote-hg
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
new file mode 100755
index 0000000..cc53091
--- /dev/null
+++ b/contrib/remote-hg/git-remote-hg
@@ -0,0 +1,254 @@
+#!/usr/bin/python
+
+# Inspired by Rocco Rutte's hg-fast-export
+
+# Just copy to your ~/bin, or anywhere in your $PATH.
+# Then you can clone with:
+# git clone hg::/path/to/mercurial/repo/
+
+from mercurial import hg, ui
+
+import re
+import sys
+import os
+import json
+
+first = True
+
+def die(msg, *args):
+ sys.stderr.write('ERROR: %s\n' % (msg % args))
+ sys.exit(1)
+
+def warn(msg, *args):
+ sys.stderr.write('WARNING: %s\n' % (msg % args))
+
+def gitmode(flags):
+ return 'l' in flags and '120000' or 'x' in flags and '100755' or '100644'
+
+def export_file(fc):
+ if fc.path() == '.hgtags':
+ return
+ d = fc.data()
+ print "M %s inline %s" % (gitmode(fc.flags()), fc.path())
+ print "data %d" % len(d)
+ print d
+
+def get_filechanges(repo, ctx, parents):
+ l = [repo.status(p, ctx)[:3] for p in parents]
+ changed, added, removed = [sum(e, []) for e in zip(*l)]
+ return added + changed, removed
+
+author_re = re.compile('^((.+?) )?(<.+?>)$')
+
+def fixup_user(user):
+ user = user.replace('"', '')
+ m = author_re.match(user)
+ if m:
+ name = m.group(1)
+ mail = m.group(3)
+ else:
+ name = user
+ mail = None
+
+ if not name:
+ name = 'Unknown'
+ if not mail:
+ mail = '<unknown>'
+
+ return '%s %s' % (name, mail)
+
+def get_repo(path, alias):
+ global dirname
+
+ myui = ui.ui()
+ myui.setconfig('ui', 'interactive', 'off')
+
+ if hg.islocal(path):
+ repo = hg.repository(myui, path)
+ else:
+ local_path = os.path.join(dirname, 'clone')
+ if not os.path.exists(local_path):
+ srcpeer, dstpeer = hg.clone(myui, {}, path, local_path, update=False, pull=True)
+ repo = dstpeer.local()
+ else:
+ repo = hg.repository(myui, local_path)
+ peer = hg.peer(myui, {}, path)
+ repo.pull(peer, heads=None, force=True)
+
+ return repo
+
+def hg_branch(b):
+ if b == 'master':
+ return 'default'
+ return b
+
+def git_branch(b):
+ if b == 'default':
+ return 'master'
+ return b
+
+def export_tag(repo, tag):
+ global prefix
+ print "reset %s/tags/%s" % (prefix, tag)
+ print "from :%s" % (repo[tag].rev() + 1)
+ print
+
+def export_branch(repo, branch):
+ global prefix, marks, cache, branches
+
+ heads = branches[hg_branch(branch)]
+
+ # verify there's only one head
+ if (len(heads) > 1):
+ warn("Branch '%s' has more than one head, consider merging" % hg_branch(branch))
+
+ head = repo[heads[0]]
+ tip = marks.get(branch, 0)
+ # mercurial takes too much time checking this
+ if tip == head.rev():
+ # nothing to do
+ return
+ revs = repo.revs('%u:%u' % (tip, head))
+ count = 0
+
+ revs = [rev for rev in revs if not cache.get(rev, False)]
+
+ for rev in revs:
+
+ c = repo[rev]
+ (manifest, user, (time, tz), files, desc, extra) = repo.changelog.read(c.node())
+ rev_branch = git_branch(extra['branch'])
+
+ tz = '%+03d%02d' % (-tz / 3600, -tz % 3600 / 60)
+
+ print "commit %s/branches/%s" % (prefix, rev_branch)
+ print "mark :%d" % (rev + 1)
+ print "committer %s %d %s" % (fixup_user(user), time, tz)
+ print "data %d" % (len(desc) + 1)
+ print desc
+ print
+
+ parents = [p for p in repo.changelog.parentrevs(rev) if p >= 0]
+
+ if len(parents) == 0:
+ modified = c.manifest().keys()
+ removed = []
+ else:
+ added = []
+ changed = []
+ print "from :%s" % (parents[0] + 1)
+ if len(parents) > 1:
+ print "merge :%s" % (parents[1] + 1)
+ modified, removed = get_filechanges(repo, c, parents)
+
+ for f in removed:
+ print "D %s" % (f)
+ for f in modified:
+ export_file(c.filectx(f))
+ print
+
+ count += 1
+ if (count % 100 == 0):
+ print "progress revision %d '%s' (%d/%d)" % (rev, branch, count, len(revs))
+ print "#############################################################"
+
+ cache[rev] = True
+
+ # store the latest revision
+ marks[branch] = rev
+
+def do_capabilities(repo, args):
+ global prefix, dirname
+
+ print "import"
+ print "refspec refs/heads/*:%s/branches/*" % prefix
+ print "refspec refs/tags/*:%s/tags/*" % prefix
+ print
+
+def do_list(repo, args):
+ global branches
+
+ head = repo.dirstate.branch()
+ for branch in repo.branchmap():
+ heads = repo.branchheads(branch)
+ if len(heads):
+ branches[branch] = heads
+
+ for branch in branches:
+ print "? refs/heads/%s" % git_branch(branch)
+ for tag, node in repo.tagslist():
+ if tag == 'tip':
+ continue
+ print "? refs/tags/%s" % tag
+ print "@refs/heads/%s HEAD" % git_branch(head)
+ print
+
+def do_import(repo, args):
+ global first
+
+ ref = args[1]
+
+ if first:
+ path = os.path.join(dirname, 'marks-git')
+
+ if os.path.exists(path):
+ print "feature import-marks=%s" % path
+ print "feature export-marks=%s" % path
+ sys.stdout.flush()
+ first = False
+
+ if (ref == 'HEAD'):
+ return
+
+ if ref.startswith('refs/heads/'):
+ branch = ref[len('refs/heads/'):]
+ export_branch(repo, branch)
+ elif ref.startswith('refs/tags/'):
+ tag = ref[len('refs/tags/'):]
+ export_tag(repo, tag)
+
+def main(args):
+ global prefix, dirname, marks, cache, branches
+
+ alias = args[1]
+ url = args[2]
+
+ gitdir = os.environ['GIT_DIR']
+ dirname = os.path.join(gitdir, 'hg', alias)
+ cache = {}
+ branches = {}
+
+ repo = get_repo(url, alias)
+ prefix = 'refs/hg/%s' % alias
+
+ if not os.path.exists(dirname):
+ os.makedirs(dirname)
+
+ marks_path = os.path.join(dirname, 'marks-hg')
+ try:
+ fp = open(marks_path, 'r')
+ marks = json.load(fp)
+ fp.close()
+ except IOError:
+ marks = {}
+
+ line = True
+ while (line):
+ line = sys.stdin.readline().strip()
+ if line == '':
+ break
+ args = line.split()
+ cmd = args[0]
+ if cmd == 'capabilities':
+ do_capabilities(repo, args)
+ elif cmd == 'list':
+ do_list(repo, args)
+ elif cmd == 'import':
+ do_import(repo, args)
+ sys.stdout.flush()
+
+ fp = open(marks_path, 'w')
+ json.dump(marks, fp)
+ fp.close()
+
+sys.exit(main(sys.argv))
--
1.8.0.rc2.7.g0961fdf.dirty
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Add new remote-hg transport helper
2012-10-20 15:00 [PATCH v2] Add new remote-hg transport helper Felipe Contreras
@ 2012-10-20 15:43 ` Mike Hommey
2012-10-20 16:04 ` Felipe Contreras
2012-10-28 4:24 ` Felipe Contreras
0 siblings, 2 replies; 4+ messages in thread
From: Mike Hommey @ 2012-10-20 15:43 UTC (permalink / raw)
To: Felipe Contreras
Cc: git, Junio C Hamano, Sverre Rabbelier, Ilari Liusvaara,
Daniel Barkalow, Jeff King, Michael J Gruber
On Sat, Oct 20, 2012 at 05:00:06PM +0200, Felipe Contreras wrote:
> Changes since v1:
>
> * Improved documentation
> * Use more common 'python' binary
> * Warn, don't barf when a branch has multiple heads
> * Fixed marks to fetch after cloned
> * Support for cloning/pulling remote repositories
> * Use a more appropriate internal directory (e.g. .git/hg/origin)
> * Fixes for python3
Are the resulting commits identical to what you'd get from using hg-git?
Mike
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Add new remote-hg transport helper
2012-10-20 15:43 ` Mike Hommey
@ 2012-10-20 16:04 ` Felipe Contreras
2012-10-28 4:24 ` Felipe Contreras
1 sibling, 0 replies; 4+ messages in thread
From: Felipe Contreras @ 2012-10-20 16:04 UTC (permalink / raw)
To: Mike Hommey
Cc: git, Junio C Hamano, Sverre Rabbelier, Ilari Liusvaara,
Daniel Barkalow, Jeff King, Michael J Gruber
On Sat, Oct 20, 2012 at 5:43 PM, Mike Hommey <mh@glandium.org> wrote:
> On Sat, Oct 20, 2012 at 05:00:06PM +0200, Felipe Contreras wrote:
>> Changes since v1:
>>
>> * Improved documentation
>> * Use more common 'python' binary
>> * Warn, don't barf when a branch has multiple heads
>> * Fixed marks to fetch after cloned
>> * Support for cloning/pulling remote repositories
>> * Use a more appropriate internal directory (e.g. .git/hg/origin)
>> * Fixes for python3
>
> Are the resulting commits identical to what you'd get from using hg-git?
No, but should be easy to implement.
--
Felipe Contreras
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Add new remote-hg transport helper
2012-10-20 15:43 ` Mike Hommey
2012-10-20 16:04 ` Felipe Contreras
@ 2012-10-28 4:24 ` Felipe Contreras
1 sibling, 0 replies; 4+ messages in thread
From: Felipe Contreras @ 2012-10-28 4:24 UTC (permalink / raw)
To: Mike Hommey
Cc: git, Junio C Hamano, Sverre Rabbelier, Ilari Liusvaara,
Daniel Barkalow, Jeff King, Michael J Gruber
On Sat, Oct 20, 2012 at 5:43 PM, Mike Hommey <mh@glandium.org> wrote:
> On Sat, Oct 20, 2012 at 05:00:06PM +0200, Felipe Contreras wrote:
>> Changes since v1:
>>
>> * Improved documentation
>> * Use more common 'python' binary
>> * Warn, don't barf when a branch has multiple heads
>> * Fixed marks to fetch after cloned
>> * Support for cloning/pulling remote repositories
>> * Use a more appropriate internal directory (e.g. .git/hg/origin)
>> * Fixes for python3
>
> Are the resulting commits identical to what you'd get from using hg-git?
Now they are :)
--
Felipe Contreras
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-28 4:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-20 15:00 [PATCH v2] Add new remote-hg transport helper Felipe Contreras
2012-10-20 15:43 ` Mike Hommey
2012-10-20 16:04 ` Felipe Contreras
2012-10-28 4:24 ` Felipe Contreras
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).