mercurial-scm/hg-stable: hgext/convert/git.py annotate

annotate hgext/convert/git.py @ 7243:a8e4e599e17f

convert: return remote branches in git source When converting git repos, all stuff happening on branches seems to be ignored. This is caused by the fact a "git clone" of a remote git repo has all its branches prefixed with "origin/". By chance, the "origin/master" branch is always linked to a local "master" branch. So getheads() returns only the master head, and it ignores all the other heads. Make sure getheads() returns all heads, forcing remote branches to be return by git-rev-parse.

author	Edouard Gomez <ed.gomez@free.fr>
date	Sun, 19 Oct 2008 00:32:23 +0200
parents	c1dc903dc7b6
children	2fef3051ebb3

rev	line source
4536 cc9b79216a76 Split convert extension into common and repository type modules Brendan Cully <brendan@kublai.com> parents: 4532 diff changeset	1 # git support for the convert extension
3821 158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2657 diff changeset	2
4536 cc9b79216a76 Split convert extension into common and repository type modules Brendan Cully <brendan@kublai.com> parents: 4532 diff changeset	3 import os
5220 9d7052f17d77 convert: fix /dev/null redirections under Windows Patrick Mezard <pmezard@gmail.com> parents: 5217 diff changeset	4 from mercurial import util
3938 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3917 diff changeset	5
5497 f0a3918abd42 convert: fail if an external required tool is not found Patrick Mezard <pmezard@gmail.com> parents: 5404 diff changeset	6 from common import NoRepo, commit, converter_source, checktool
3954 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3953 diff changeset	7
4448 af013ae3ca10 use documented convert-repo interface Daniel Holth <dholth@fastmail.fm> parents: 4447 diff changeset	8 class convert_git(converter_source):
5217 149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	9 # Windows does not support GIT_DIR= construct while other systems
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	10 # cannot remove environment variable. Just assume none have
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	11 # both issues.
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	12 if hasattr(os, 'unsetenv'):
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	13 def gitcmd(self, s):
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	14 prevgitdir = os.environ.get('GIT_DIR')
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	15 os.environ['GIT_DIR'] = self.path
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	16 try:
7222 c1dc903dc7b6 convert: read git output in binary mode under Windows (issue 1359) Patrick Mezard <pmezard@gmail.com> parents: 6837 diff changeset	17 return util.popen(s, 'rb')
5217 149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	18 finally:
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	19 if prevgitdir is None:
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	20 del os.environ['GIT_DIR']
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	21 else:
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	22 os.environ['GIT_DIR'] = prevgitdir
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	23 else:
149742a628fd convert: fix issue702 about GIT_DIR= construct unsupported under Windows. Patrick Mezard <pmezard@gmail.com> parents: 5216 diff changeset	24 def gitcmd(self, s):
7222 c1dc903dc7b6 convert: read git output in binary mode under Windows (issue 1359) Patrick Mezard <pmezard@gmail.com> parents: 6837 diff changeset	25 return util.popen('GIT_DIR=%s %s' % (self.path, s), 'rb')
4767 2d0a823cbba5 convert: gitcmd wrapper for os.popen Brendan Cully <brendan@kublai.com> parents: 4760 diff changeset	26
4760 07efcce17d28 convert: add -r argument specifying latest revision to convert Brendan Cully <brendan@kublai.com> parents: 4759 diff changeset	27 def __init__(self, ui, path, rev=None):
4807 15a3cbfc6568 convert: call superclass init from engine init functions Brendan Cully <brendan@kublai.com> parents: 4768 diff changeset	28 super(convert_git, self).__init__(ui, path, rev=rev)
15a3cbfc6568 convert: call superclass init from engine init functions Brendan Cully <brendan@kublai.com> parents: 4768 diff changeset	29
3938 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3917 diff changeset	30 if os.path.isdir(path + "/.git"):
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3917 diff changeset	31 path += "/.git"
4102 06d65498f73b convert-repo: use .git/objects/ rather than .git/HEAD to detect git repos Matt Mackall <mpm@selenic.com> parents: 4082 diff changeset	32 if not os.path.exists(path + "/objects"):
5521 03496d4fa509 convert: display all errors if we couldn't open the source repo Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5481 diff changeset	33 raise NoRepo("%s does not look like a Git repo" % path)
5497 f0a3918abd42 convert: fail if an external required tool is not found Patrick Mezard <pmezard@gmail.com> parents: 5404 diff changeset	34
6837 e30c56f337b1 convert: use git executable only, with subcommands Dhruva Krishnamurthy <dhruvakm@gmail.com> parents: 6001 diff changeset	35 checktool('git', 'git')
5497 f0a3918abd42 convert: fail if an external required tool is not found Patrick Mezard <pmezard@gmail.com> parents: 5404 diff changeset	36
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	37 self.path = path
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	38
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	39 def getheads(self):
4768 f52bfe566583 convert: import all branches from git repositories Brendan Cully <brendan@kublai.com> parents: 4767 diff changeset	40 if not self.rev:
7243 a8e4e599e17f convert: return remote branches in git source Edouard Gomez <ed.gomez@free.fr> parents: 7222 diff changeset	41 return self.gitcmd('git rev-parse --branches --remotes').read().splitlines()
4768 f52bfe566583 convert: import all branches from git repositories Brendan Cully <brendan@kublai.com> parents: 4767 diff changeset	42 else:
6837 e30c56f337b1 convert: use git executable only, with subcommands Dhruva Krishnamurthy <dhruvakm@gmail.com> parents: 6001 diff changeset	43 fh = self.gitcmd("git rev-parse --verify %s" % self.rev)
4768 f52bfe566583 convert: import all branches from git repositories Brendan Cully <brendan@kublai.com> parents: 4767 diff changeset	44 return [fh.read()[:-1]]
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	45
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	46 def catfile(self, rev, type):
695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	47 if rev == "0" * 40: raise IOError()
6837 e30c56f337b1 convert: use git executable only, with subcommands Dhruva Krishnamurthy <dhruvakm@gmail.com> parents: 6001 diff changeset	48 fh = self.gitcmd("git cat-file %s %s" % (type, rev))
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	49 return fh.read()
695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	50
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	51 def getfile(self, name, rev):
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	52 return self.catfile(rev, "blob")
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	53
3956 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	54 def getmode(self, name, rev):
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	55 return self.modecache[(name, rev)]
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	56
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	57 def getchanges(self, version):
3956 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	58 self.modecache = {}
6837 e30c56f337b1 convert: use git executable only, with subcommands Dhruva Krishnamurthy <dhruvakm@gmail.com> parents: 6001 diff changeset	59 fh = self.gitcmd("git diff-tree --root -m -r %s" % version)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	60 changes = []
5335 88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5220 diff changeset	61 seen = {}
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	62 for l in fh:
5335 88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5220 diff changeset	63 if "\t" not in l:
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5220 diff changeset	64 continue
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	65 m, f = l[:-1].split("\t")
5335 88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5220 diff changeset	66 if f in seen:
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5220 diff changeset	67 continue
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5220 diff changeset	68 seen[f] = 1
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	69 m = m.split()
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	70 h = m[3]
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	71 p = (m[1] == "100755")
4082 6b2909e84203 convert-repo converts symlinks from git Daniel Holth <dholth@fastmail.fm> parents: 4062 diff changeset	72 s = (m[1] == "120000")
6b2909e84203 convert-repo converts symlinks from git Daniel Holth <dholth@fastmail.fm> parents: 4062 diff changeset	73 self.modecache[(f, h)] = (p and "x") or (s and "l") or ""
3956 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	74 changes.append((f, h))
5121 ef338e34a906 convert: look up copies in getchanges instead of getcommit Brendan Cully <brendan@kublai.com> parents: 4873 diff changeset	75 return (changes, {})
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	76
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	77 def getcommit(self, version):
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	78 c = self.catfile(version, "commit") # read the commit hash
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	79 end = c.find("\n\n")
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	80 message = c[end+2:]
4759 20ec5cc02f18 convert: ove recode method into converter_source Brendan Cully <brendan@kublai.com> parents: 4721 diff changeset	81 message = self.recode(message)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	82 l = c[:end].splitlines()
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	83 manifest = l[0].split()[1]
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	84 parents = []
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	85 for e in l[1:]:
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	86 n, v = e.split(" ", 1)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	87 if n == "author":
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	88 p = v.split()
1385 adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	89 tm, tz = p[-2:]
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	90 author = " ".join(p[:-2])
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	91 if author[0] == "<": author = author[1:-1]
4759 20ec5cc02f18 convert: ove recode method into converter_source Brendan Cully <brendan@kublai.com> parents: 4721 diff changeset	92 author = self.recode(author)
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	93 if n == "committer":
431 dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	94 p = v.split()
1385 adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	95 tm, tz = p[-2:]
431 dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	96 committer = " ".join(p[:-2])
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	97 if committer[0] == "<": committer = committer[1:-1]
4759 20ec5cc02f18 convert: ove recode method into converter_source Brendan Cully <brendan@kublai.com> parents: 4721 diff changeset	98 committer = self.recode(committer)
3910 4bc5a2405b12 convert-repo: fix recoding of committer Matt Mackall <mpm@selenic.com> parents: 3821 diff changeset	99 message += "\ncommitter: %s\n" % committer
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	100 if n == "parent": parents.append(v)
1385 adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	101
adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	102 tzs, tzh, tzm = tz[-5:-4] + "1", tz[-4:-2], tz[-2:]
2093 5cc414722587 convert-repo: fix reversed time zone offset Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1715 diff changeset	103 tz = -int(tzs) * (int(tzh) * 3600 + int(tzm))
1385 adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	104 date = tm + " " + str(tz)
3954 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3953 diff changeset	105
4873 28b23b9073a8 convert: record the source revision in the changelog Brendan Cully <brendan@kublai.com> parents: 4810 diff changeset	106 c = commit(parents=parents, date=date, author=author, desc=message,
28b23b9073a8 convert: record the source revision in the changelog Brendan Cully <brendan@kublai.com> parents: 4810 diff changeset	107 rev=version)
3954 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3953 diff changeset	108 return c
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	109
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	110 def gettags(self):
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	111 tags = {}
6837 e30c56f337b1 convert: use git executable only, with subcommands Dhruva Krishnamurthy <dhruvakm@gmail.com> parents: 6001 diff changeset	112 fh = self.gitcmd('git ls-remote --tags "%s"' % self.path)
4062 516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	113 prefix = 'refs/tags/'
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	114 for line in fh:
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	115 line = line.strip()
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	116 if not line.endswith("^{}"):
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	117 continue
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	118 node, tag = line.split(None, 1)
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	119 if not tag.startswith(prefix):
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	120 continue
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	121 tag = tag[len(prefix):-3]
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	122 tags[tag] = node
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	123
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	124 return tags
5380 a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	125
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	126 def getchangedfiles(self, version, i):
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	127 changes = []
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	128 if i is None:
6837 e30c56f337b1 convert: use git executable only, with subcommands Dhruva Krishnamurthy <dhruvakm@gmail.com> parents: 6001 diff changeset	129 fh = self.gitcmd("git diff-tree --root -m -r %s" % version)
5380 a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	130 for l in fh:
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	131 if "\t" not in l:
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	132 continue
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	133 m, f = l[:-1].split("\t")
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	134 changes.append(f)
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	135 fh.close()
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	136 else:
6837 e30c56f337b1 convert: use git executable only, with subcommands Dhruva Krishnamurthy <dhruvakm@gmail.com> parents: 6001 diff changeset	137 fh = self.gitcmd('git diff-tree --name-only --root -r %s "%s^%s" --'
5380 a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	138 % (version, version, i+1))
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	139 changes = [f.rstrip('\n') for f in fh]
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	140 fh.close()
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	141
a5a7f7fd5554 convert_git: add --filemap support Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5336 diff changeset	142 return changes

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/convert/git.py @ 7243:a8e4e599e17f