Mercurial > hg

comparison hgext/convert/p4.py @ 21758:c27a37678508 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
p4: accept changesets with no description (issue4282)
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Jun 2014 12:04:48 -0500
parents 363e808de349
children 754f208ce21d
comparison
equal deleted inserted replaced
21752:e250a482478e 21758:c27a37678508
106 lastid = None 106 lastid = None
107 for change in self.p4changes: 107 for change in self.p4changes:
108 cmd = "p4 -G describe -s %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 desc = self.recode(d["desc"]) 111 desc = self.recode(d.get("desc", ""))
112 shortdesc = desc.split("\n", 1)[0] 112 shortdesc = desc.split("\n", 1)[0]
113 t = '%s %s' % (d["change"], repr(shortdesc)[1:-1]) 113 t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])
114 ui.status(util.ellipsis(t, 80) + '\n') 114 ui.status(util.ellipsis(t, 80) + '\n')
115 115
116 if lastid: 116 if lastid: