##// END OF EJS Templates
convert: Work around p4 instability (issue2465)...
Mike Sperber -
r12891:b69fd38a stable
parent child Browse files
Show More
@@ -105,10 +105,9 b' class p4_source(converter_source):'
105 ui.status(_('collecting p4 changelists\n'))
105 ui.status(_('collecting p4 changelists\n'))
106 lastid = None
106 lastid = None
107 for change in self.p4changes:
107 for change in self.p4changes:
108 cmd = "p4 -G describe %s" % change
108 cmd = "p4 -G describe -s %s" % change
109 stdout = util.popen(cmd, mode='rb')
109 stdout = util.popen(cmd, mode='rb')
110 d = marshal.load(stdout)
110 d = marshal.load(stdout)
111
112 desc = self.recode(d["desc"])
111 desc = self.recode(d["desc"])
113 shortdesc = desc.split("\n", 1)[0]
112 shortdesc = desc.split("\n", 1)[0]
114 t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])
113 t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])
General Comments 0
You need to be logged in to leave comments. Login now