comparison hgext/convert/subversion.py @ 41616:2c13e91ede6e

convert: handle empty intial commits while converting to svn Svn commit generation code skips empty commits, returning the parent. Skipping the root commit must return None instead. Added test to check skipping of empty commits.
author Nikita Slyusarev <nslus@yandex-team.com>
date Thu, 07 Feb 2019 18:57:54 +0300
parents 876494fd967d
children 36ee0d6d64c5
comparison
equal deleted inserted replaced
41615:328ca3b9e545 41616:2c13e91ede6e
1322 file=messagefile, 1322 file=messagefile,
1323 encoding='utf-8') 1323 encoding='utf-8')
1324 try: 1324 try:
1325 rev = self.commit_re.search(output).group(1) 1325 rev = self.commit_re.search(output).group(1)
1326 except AttributeError: 1326 except AttributeError:
1327 if parents and not files: 1327 if not files:
1328 return parents[0] 1328 return parents[0] if parents else None
1329 self.ui.warn(_('unexpected svn output:\n')) 1329 self.ui.warn(_('unexpected svn output:\n'))
1330 self.ui.warn(output) 1330 self.ui.warn(output)
1331 raise error.Abort(_('unable to cope with svn output')) 1331 raise error.Abort(_('unable to cope with svn output'))
1332 if commit.rev: 1332 if commit.rev:
1333 self.run('propset', 'hg:convert-rev', commit.rev, 1333 self.run('propset', 'hg:convert-rev', commit.rev,