( )⚙ D6395 rust-dirstate: call new "dirs" rust implementation from Python

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6395

rust-dirstate: call new "dirs" rust implementation from Python
ClosedPublic

Authored by Alphare on May 17 2019, 6:10 AM.

Details

Reviewers
kevincox
Group Reviewers
hg-reviewers
Commits
rHG2db96bf84a8f: rust-dirstate: call new "dirs" rust implementation from Python
rHGf5ef8c85477d: rust-dirstate: call new "dirs" rust implementation from Python
Summary

This is a simple module attribute replacement, will take precedence over the
Python and C implementations.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.May 17 2019, 6:10 AM
Alphare updated this revision to Diff 15343.Jun 5 2019, 12:23 PM
Alphare updated this revision to Diff 15509.Jun 14 2019, 6:14 AM
Alphare added a comment.Jun 14 2019, 6:15 AM

Updated to use the new Rust module policy

kevincox accepted this revision.Jun 14 2019, 6:18 AM
Alphare updated this revision to Diff 15672.Jun 27 2019, 9:17 AM
Alphare added a commit: rHGf5ef8c85477d: rust-dirstate: call new "dirs" rust implementation from Python.Jun 28 2019, 11:14 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf5ef8c85477d: rust-dirstate: call new "dirs" rust implementation from Python (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jun 29 2019, 11:41 PM
  • a/rust/hg-core/src/dirstate/dirs_multiset.rs

+++ b/rust/hg-core/src/dirstate/dirs_multiset.rs
@@ -118,7 +118,9 @@

    entry.remove();
}
Entry::Vacant(_) => {
  • return Err(DirstateMapError::PathNotFound(path.to_owned()))

+ return Err(DirstateMapError::PathNotFound(
+ path.to_owned(),
+ ))

    }
};

Unrelated change. Dropped.

Revision Contents
Changeset List

Diff 15696

mercurial/util.py

urllibcompat, urllibcompat,
) )
from .utils import ( from .utils import (
compression, compression,
procutil, procutil,
stringutil, stringutil,
) )
rustdirs = policy.importrust('dirstate', 'Dirs')
base85 = policy.importmod(r'base85') base85 = policy.importmod(r'base85')
osutil = policy.importmod(r'osutil') osutil = policy.importmod(r'osutil')
parsers = policy.importmod(r'parsers') parsers = policy.importmod(r'parsers')
b85decode = base85.b85decode b85decode = base85.b85decode
b85encode = base85.b85encode b85encode = base85.b85encode
cookielib = pycompat.cookielib cookielib = pycompat.cookielib
return iter(self._dirs) return iter(self._dirs)
def __contains__(self, d): def __contains__(self, d):
return d in self._dirs return d in self._dirs
if safehasattr(parsers, 'dirs'): if safehasattr(parsers, 'dirs'):
dirs = parsers.dirs dirs = parsers.dirs
if rustdirs is not None:
dirs = rustdirs
def finddirs(path): def finddirs(path):
pos = path.rfind('/') pos = path.rfind('/')
while pos != -1: while pos != -1:
yield path[:pos] yield path[:pos]
pos = path.rfind('/', 0, pos) pos = path.rfind('/', 0, pos)
yield '' yield ''

rust/hg-core/src/dirstate/dirs_multiset.rs

let val = entry.get().clone(); let val = entry.get().clone();
if val > 1 { if val > 1 {
entry.insert(val - 1); entry.insert(val - 1);
break; break;
} }
entry.remove(); entry.remove();
} }
Entry::Vacant(_) => { Entry::Vacant(_) => {
return Err(DirstateMapError::PathNotFound(path.to_owned())) return Err(DirstateMapError::PathNotFound(
path.to_owned(),
))
} }
}; };
pos = subpath.len(); pos = subpath.len();
if pos == 0 { if pos == 0 {
break; break;
} }
} }