p4: accept changesets with no description (issue4282) stable
authorMatt Mackall <mpm@selenic.com>
Mon, 16 Jun 2014 12:04:48 -0500
branchstable
changeset 21758 c27a37678508
parent 21752 e250a482478e
child 21759 bd3360c63bb3
p4: accept changesets with no description (issue4282)
hgext/convert/p4.py
--- a/hgext/convert/p4.py	Sat Jun 14 11:49:02 2014 -0500
+++ b/hgext/convert/p4.py	Mon Jun 16 12:04:48 2014 -0500
@@ -108,7 +108,7 @@
             cmd = "p4 -G describe -s %s" % change
             stdout = util.popen(cmd, mode='rb')
             d = marshal.load(stdout)
-            desc = self.recode(d["desc"])
+            desc = self.recode(d.get("desc", ""))
             shortdesc = desc.split("\n", 1)[0]
             t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])
             ui.status(util.ellipsis(t, 80) + '\n')