# HG changeset patch # User Mads Kiilerich # Date 2013-11-17 00:56:30 # Node ID d54467c1a19803de109fb8a297537d052cecc189 # Parent cbcd85fa75c07670bc9263b8610ac3b43acac538 convert: fix svn crash when svn.ra.get_log calls back with orig_paths=None get_log started calling back with orig_paths=None on Fedora 20 with subversion-1.8.3. That broke test-convert-svn-source.t . There used to be some handling of that situation until e8f4e40f285a apparently broke it. This patch restores what seems to be the most obvious handling of the situation. diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -91,10 +91,11 @@ def get_log_child(fp, url, paths, start, discover_changed_paths=True, strict_node_history=False): protocol = -1 def receiver(orig_paths, revnum, author, date, message, pool): + paths = {} if orig_paths is not None: for k, v in orig_paths.iteritems(): - orig_paths[k] = changedpath(v) - pickle.dump((orig_paths, revnum, author, date, message), + paths[k] = changedpath(v) + pickle.dump((paths, revnum, author, date, message), fp, protocol) try: