# HG changeset patch # User Adrian Buehlmann # Date 2012-09-19 11:58:51 # Node ID 448e6ed7c5572c2d7a56cac20b970bee437c442d # Parent 57bf86677daa88a47e20b5712403ffd163c5bf16 store: move _plainhybridencode and _dothybridencode higher up in the file no functional change diff --git a/mercurial/store.py b/mercurial/store.py --- a/mercurial/store.py +++ b/mercurial/store.py @@ -254,6 +254,20 @@ def _hybridencode(path, dotencode): res = _hashencode(path, dotencode) return res +def _plainhybridencode(f): + return _hybridencode(f, False) + +_pathencode = getattr(parsers, 'pathencode', None) +if _pathencode: + def _dothybridencode(f): + ef = _pathencode(f) + if ef is None: + return _hashencode(encodedir(f), True) + return ef +else: + def _dothybridencode(f): + return _hybridencode(f, True) + def _calcmode(path): try: # files in .hg/ will be created using this mode @@ -419,20 +433,6 @@ class _fncacheopener(scmutil.abstractope self.fncache.add(path) return self.opener(self.encode(path), mode, *args, **kw) -def _plainhybridencode(f): - return _hybridencode(f, False) - -_pathencode = getattr(parsers, 'pathencode', None) -if _pathencode: - def _dothybridencode(f): - ef = _pathencode(f) - if ef is None: - return _hashencode(encodedir(f), True) - return ef -else: - def _dothybridencode(f): - return _hybridencode(f, True) - class fncachestore(basicstore): def __init__(self, path, openertype, dotencode): if dotencode: