Mercurial > hg
changeset 20057:d54467c1a198 stable
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.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sat, 16 Nov 2013 19:56:30 -0500 |
| parents | cbcd85fa75c0 |
| children | 5e301ca90b26 750d04e747aa |
| files | hgext/convert/subversion.py |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/subversion.py Sat Nov 16 17:30:34 2013 -0500 +++ b/hgext/convert/subversion.py Sat Nov 16 19:56:30 2013 -0500 @@ -91,10 +91,11 @@ 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: