Use XML output to compute SVN.is_pristine() #3653
Conversation
ghost
assigned 
|
Note.- If externals do not define a revision the |
| class SVNToolTestsPristineWithExternals(SVNLocalRepoTestCase): | ||
|
|
||
| def _propset_cmd(self, relpath, rev, url): | ||
| return 'propset svn:externals "{} -r{} {}" .'.format(relpath, rev, url) |
There was a problem hiding this comment.
I thought the definition is `svn:externals "-r148 http://svn.example.com/skinproj third-party/skins", so ' relpath' and 'revsion' changed
There was a problem hiding this comment.
I just recognized, that this is the new scheme (from Subversion 1.5). The old is still usable.
There was a problem hiding this comment.
These means, we have to check both schemes, because we have to find the revision & local path of it. We have to watch, because there are also some different whitepace possibilities:
$ svn propget svn:externals paint
http://svn.thirdparty.com/repos/My%20Project "My Project"
http://svn.thirdparty.com/repos/%22Quotes%20Too%22 \"Quotes\ Too\"
$
There was a problem hiding this comment.
But Conan works only from the consumer point of view, and I hope --xml output will be the same regardless of the externals property syntax.
|
I've added some tests. I'm finding it quite difficult to build tests using a peg_revision 😖 |
|
Conflicts |
conans/test/util/tools_test.py
Outdated
|
|
||
| shutil.rmtree(repo_url, ignore_errors=False, onerror=try_remove_readonly) | ||
| self.assertFalse(os.path.exists(repo_url)) | ||
| with self.assertRaisesRegexp(subprocess.CalledProcessError, "non-zero exit status 1"): |
There was a problem hiding this comment.
This shouldn't be an Exception, should return False, to allow creating the package, even if it is not pristine.
Use XML output to compute SVN.is_pristine()
Changelog: Fix: Use XML output from SVN command line interface to compute if the repository is pristine.
Tests needed (from comments):
svn:externalsdefinition without fixed revision --> should lead to error, because not fixedsvn:externalsdefinition with pegged revisionsvn:externalsdefinition with pegged revision & operative revision --> could be different revsisions, we must use operative revisionis_pristinefunction.