##// END OF EJS Templates
check-code: entirely drop the 'non-py24.py' file from the test...
check-code: entirely drop the 'non-py24.py' file from the test There are no Python 2.4 related errors remaining.

File last commit:

r24395:216fa1ba default
r25199:e78447e6 default
Show More
p4.py
207 lines | 6.9 KiB | text/x-python | PythonLexer
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 # Perforce source for convert extension.
#
# Copyright 2009, Frank Kingswood <frank@kingswood-consulting.co.uk>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
from mercurial import util
from mercurial.i18n import _
Matt Mackall
convert: attempt to check repo type before checking for tool
r7973 from common import commit, converter_source, checktool, NoRepo
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 import marshal
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 import re
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
def loaditer(f):
"Yield the dictionary objects generated by p4"
try:
while True:
d = marshal.load(f)
if not d:
break
yield d
except EOFError:
pass
class p4_source(converter_source):
def __init__(self, ui, path, rev=None):
super(p4_source, self).__init__(ui, path, rev=rev)
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 if "/" in path and not path.startswith('//'):
Martin Geisler
convert: mark strings for translation
r10939 raise NoRepo(_('%s does not look like a P4 repository') % path)
Matt Mackall
convert: attempt to check repo type before checking for tool
r7973
Mads Kiilerich
convert: missing p4 tool is only slightly fatal...
r7905 checktool('p4', abort=False)
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
self.p4changes = {}
self.heads = {}
self.changeset = {}
self.files = {}
self.tags = {}
self.lastbranch = {}
self.parent = {}
self.encoding = "latin_1"
self.depotname = {} # mapping from local name to depot name
Matt Mackall
many, many trivial check-code fixups
r10282 self.re_type = re.compile(
"([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)"
"(\+\w+)?$")
self.re_keywords = re.compile(
r"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)"
r":[^$\n]*\$")
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 self.re_keywords_old = re.compile("\$(Id|Header):[^$\n]*\$")
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
self._parse(ui, path)
def _parse_view(self, path):
"Read changes affecting the path"
Frank Kingswood
Fix shell quoting on p4 conversion
r11347 cmd = 'p4 -G changes -s submitted %s' % util.shellquote(path)
Peter Ingebretson
convert: fix marshalling in P4 convert extension to use a binary stream...
r9474 stdout = util.popen(cmd, mode='rb')
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 for d in loaditer(stdout):
c = d.get("change", None)
if c:
self.p4changes[c] = True
def _parse(self, ui, path):
"Prepare list of P4 filenames and revisions to import"
ui.status(_('reading p4 views\n'))
# read client spec or view
if "/" in path:
self._parse_view(path)
if path.startswith("//") and path.endswith("/..."):
views = {path[:-3]:""}
else:
views = {"//": ""}
else:
Frank Kingswood
Fix shell quoting on p4 conversion
r11347 cmd = 'p4 -G client -o %s' % util.shellquote(path)
Peter Ingebretson
convert: fix marshalling in P4 convert extension to use a binary stream...
r9474 clientspec = marshal.load(util.popen(cmd, mode='rb'))
Dirkjan Ochtman
cleanup: remove all trailing whitespace
r7869
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 views = {}
for client in clientspec:
if client.startswith("View"):
sview, cview = clientspec[client].split()
self._parse_view(sview)
if sview.endswith("...") and cview.endswith("..."):
sview = sview[:-3]
cview = cview[:-3]
cview = cview[2:]
cview = cview[cview.find("/") + 1:]
views[sview] = cview
# list of changes that affect our source files
self.p4changes = self.p4changes.keys()
self.p4changes.sort(key=int)
# list with depot pathnames, longest first
vieworder = views.keys()
Martin Geisler
p4: simplify sort key
r9039 vieworder.sort(key=len, reverse=True)
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
# handle revision limiting
startrev = self.ui.config('convert', 'p4.startrev', default=0)
Dirkjan Ochtman
cleanup: remove all trailing whitespace
r7869 self.p4changes = [x for x in self.p4changes
if ((not startrev or int(x) >= int(startrev)) and
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 (not self.rev or int(x) <= int(self.rev)))]
# now read the full changelists to get the list of file revisions
ui.status(_('collecting p4 changelists\n'))
lastid = None
for change in self.p4changes:
Mike Sperber
convert: Work around p4 instability (issue2465)...
r12891 cmd = "p4 -G describe -s %s" % change
Peter Ingebretson
convert: fix marshalling in P4 convert extension to use a binary stream...
r9474 stdout = util.popen(cmd, mode='rb')
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 d = marshal.load(stdout)
Matt Mackall
p4: accept changesets with no description (issue4282)
r21758 desc = self.recode(d.get("desc", ""))
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 shortdesc = desc.split("\n", 1)[0]
t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])
ui.status(util.ellipsis(t, 80) + '\n')
if lastid:
parents = [lastid]
else:
parents = []
Dirkjan Ochtman
cleanup: remove all trailing whitespace
r7869
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 date = (int(d["time"]), 0) # timezone not set
FUJIWARA Katsunori
i18n: use locale insensitive format for datetimes as intermediate representation (issue3398)...
r16514 c = commit(author=self.recode(d["user"]),
date=util.datestr(date, '%Y-%m-%d %H:%M:%S %1%2'),
Matt Mackall
many, many trivial check-code fixups
r10282 parents=parents, desc=desc, branch='',
extra={"p4": change})
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
files = []
i = 0
while ("depotFile%d" % i) in d and ("rev%d" % i) in d:
oldname = d["depotFile%d" % i]
filename = None
for v in vieworder:
if oldname.startswith(v):
filename = views[v] + oldname[len(v):]
break
if filename:
files.append((filename, d["rev%d" % i]))
self.depotname[filename] = oldname
i += 1
self.changeset[change] = c
self.files[change] = files
lastid = change
Dirkjan Ochtman
cleanup: remove all trailing whitespace
r7869
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 if lastid:
self.heads = [lastid]
def getheads(self):
return self.heads
def getfile(self, name, rev):
Martin Geisler
p4: fix long line and bad spacing around %
r11348 cmd = 'p4 -G print %s' \
% util.shellquote("%s#%s" % (self.depotname[name], rev))
Peter Ingebretson
convert: fix marshalling in P4 convert extension to use a binary stream...
r9474 stdout = util.popen(cmd, mode='rb')
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
mode = None
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 contents = ""
keywords = None
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
for d in loaditer(stdout):
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 code = d["code"]
data = d.get("data")
if code == "error":
raise IOError(d["generic"], data)
Dirkjan Ochtman
kill trailing whitespace
r8843
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 elif code == "stat":
Mads Kiilerich
convert: p4: ignore purged files with p4d 2012.2 and later...
r22294 if d.get("action") == "purge":
return None, None
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 p4type = self.re_type.match(d["type"])
if p4type:
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 mode = ""
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 flags = (p4type.group(1) or "") + (p4type.group(3) or "")
if "x" in flags:
mode = "x"
if p4type.group(2) == "symlink":
mode = "l"
if "ko" in flags:
keywords = self.re_keywords_old
elif "k" in flags:
keywords = self.re_keywords
Dirkjan Ochtman
kill trailing whitespace
r8843
Matt Mackall
backout most of 4f8067c94729
r12401 elif code == "text" or code == "binary":
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 contents += data
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
if mode is None:
Mads Kiilerich
convert: use None value for missing files instead of overloading IOError...
r22296 return None, None
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
Frank Kingswood
convert: Make P4 conversion cope with keywords, binary files and symbolic links....
r8829 if keywords:
contents = keywords.sub("$\\1$", contents)
if mode == "l" and contents.endswith("\n"):
contents = contents[:-1]
Patrick Mezard
convert: merge sources getmode() into getfile()
r11134 return contents, mode
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
Mads Kiilerich
convert: introduce --full for converting all files...
r22300 def getchanges(self, rev, full):
if full:
raise util.Abort(_("convert from p4 do not support --full"))
Mads Kiilerich
convert: optimize convert of files that are unmodified from p2 in merges...
r24395 return self.files[rev], {}, set()
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
def getcommit(self, rev):
return self.changeset[rev]
def gettags(self):
return self.tags
def getchangedfiles(self, rev, i):
Matt Mackall
replace util.sort with sorted built-in...
r8209 return sorted([x[0] for x in self.files[rev]])