Mercurial > hg
changeset 12891:b69fd38a034e stable
convert: Work around p4 instability (issue2465)
The p4 command-line client sometimes fails upon doing "p4 describe"
when trying to produce a patch. (I'm guessing it's a bug in p4.)
However, "hg convert" doesn't even make use of the patch, and it can
be elided by adding "-s" to the p4 command line here.
| author | Mike Sperber <sperber@deinprogramm.de> |
|---|---|
| date | Sat, 30 Oct 2010 02:47:34 -0500 |
| parents | b1c839659140 |
| children | 919c440868d9 |
| files | hgext/convert/p4.py |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/p4.py Sat Oct 30 02:47:34 2010 -0500 +++ b/hgext/convert/p4.py Sat Oct 30 02:47:34 2010 -0500 @@ -105,10 +105,9 @@ ui.status(_('collecting p4 changelists\n')) lastid = None for change in self.p4changes: - cmd = "p4 -G describe %s" % change + cmd = "p4 -G describe -s %s" % change stdout = util.popen(cmd, mode='rb') d = marshal.load(stdout) - desc = self.recode(d["desc"]) shortdesc = desc.split("\n", 1)[0] t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])