##// END OF EJS Templates
convert: fix the handling of empty changlist descriptions in P4...
David Soria Parra -
r31590:78ac8acf default
parent child Browse files
Show More
@@ -161,7 +161,12 b' class p4_source(common.converter_source)'
161 d = self._fetch_revision(change)
161 d = self._fetch_revision(change)
162 c = self._construct_commit(d, parents)
162 c = self._construct_commit(d, parents)
163
163
164 shortdesc = c.desc.splitlines(True)[0].rstrip('\r\n')
164 descarr = c.desc.splitlines(True)
165 if len(descarr) > 0:
166 shortdesc = descarr[0].rstrip('\r\n')
167 else:
168 shortdesc = '**empty changelist description**'
169
165 t = '%s %s' % (c.rev, repr(shortdesc)[1:-1])
170 t = '%s %s' % (c.rev, repr(shortdesc)[1:-1])
166 ui.status(util.ellipsis(t, 80) + '\n')
171 ui.status(util.ellipsis(t, 80) + '\n')
167
172
@@ -141,5 +141,23 b' convert again'
141 rev=1 desc="change a" tags="" files="a"
141 rev=1 desc="change a" tags="" files="a"
142 rev=0 desc="initial" tags="" files="a b/c"
142 rev=0 desc="initial" tags="" files="a b/c"
143
143
144 empty commit message
145 $ p4 edit a
146 //depot/test-mercurial-import/a#3 - opened for edit
147 $ echo aaaaa >> a
148 $ p4 submit -d ""
149 Submitting change 6.
150 Locking 1 files ...
151 edit //depot/test-mercurial-import/a#4
152 Change 6 submitted.
153 $ hg convert -s p4 $DEPOTPATH dst
154 scanning source...
155 reading p4 views
156 collecting p4 changelists
157 6 **empty changelist description**
158 sorting...
159 converting...
160 0
161
144 exit trap:
162 exit trap:
145 stopping the p4 server
163 stopping the p4 server
General Comments 0
You need to be logged in to leave comments. Login now