Mercurial > hgsubversion
diff hgsubversion/pushmod.py @ 1572:51e105c7f0c6
compathacks: deal with removed aliases in mercurial.util
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Sun, 27 May 2018 00:29:38 -0400 |
parents | ae572c9be4e6 |
children |
line wrap: on
line diff
--- a/hgsubversion/pushmod.py +++ b/hgsubversion/pushmod.py @@ -1,6 +1,7 @@ from mercurial import error as hgerror from mercurial import util as hgutil +import compathacks import svnwrap import svnexternals import util @@ -123,7 +124,7 @@ def commit(ui, repo, rev_ctx, meta, base props.setdefault(file, {})['svn:executable'] = '*' if 'l' in fctx.flags(): props.setdefault(file, {})['svn:special'] = '*' - isbinary = hgutil.binary(new_data) + isbinary = compathacks.binary(new_data) if isbinary: props.setdefault(file, {})['svn:mime-type'] = 'application/octet-stream' @@ -151,7 +152,7 @@ def commit(ui, repo, rev_ctx, meta, base base_data = 'link ' + base_data if 'l' not in rev_ctx.filectx(file).flags(): props.setdefault(file, {})['svn:special'] = None - if hgutil.binary(base_data) and not isbinary: + if compathacks.binary(base_data) and not isbinary: props.setdefault(file, {})['svn:mime-type'] = None action = 'modify' else: