separate() can't be used here since it takes non-list arguments.

• a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -778,6 +778,9 @@
  
  @repofilecache('dirstate') def dirstate(self): + return self._makedirstate() + + def _makedirstate(self):

mercurial/state.py:65: undefined name 'iv'
mercurial/state.py:73: local variable 'version' is assigned to but never used

> --- a/mercurial/utils/stringutil.py
> +++ b/mercurial/utils/stringutil.py
> @@ -29,6 +29,8 @@
> if bprefix:
> return "b'%s'" % escapestr(o)
> return "'%s'" % escapestr(o)
> + elif o is None:
> + return 'None'

Should be handled by b'%r' % o.

• a/mercurial/utils/stringutil.py +++ b/mercurial/utils/stringutil.py @@ -29,6 +29,8 @@ if bprefix: return "b'%s'" % escapestr(o) return "'%s'" % escapestr(o) + elif o is None: + return 'None'

• • a/contrib/hg-ssh +++ b/contrib/hg-ssh @@ -39,6 +39,7 @@
    
    from mercurial import ( dispatch, + pycompat, ui as uimod, )
    
    @@ -69,7 +70,7 @@ path = cmdargv[2] repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path))) if repo in allowed_paths:
• cmd = [b'-R', repo, b'serve', b'--stdio'] + cmd = [b'-R', pycompat.fsencode(repo), b'serve', b'--stdio']

• def save(self, data): + def save(self, version, data): """write all the state data stored to .hg/<filename> file
  
  we use third-party library cbor to serialize data to write in the file. """ + if not isinstance(version, int): + raise error.ProgrammingError("version of state file should be" + " an integer") + with self._repo.vfs(self.fname, 'wb', atomictemp=True) as fp: + fp.write('%d\n' % iv) cbor.dump(self.opts, fp, canonical=True)
  
  def _read(self): """reads the state file and returns a dictionary which contain data in the same format as it was before storing""" with self._repo.vfs(self.fname, 'rb') as fp: + try: + version = int(fp.readline())

• • a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -846,7 +846,7 @@ def rawsize(self, rev): """return the length of the uncompressed text for a given revision""" l = self.index[rev][2]
• if l >= 0: + if l is not None and l >= 0:

bundle = None
try:  # guards bundle

• bundlepath = "bundle:%s+%s" % (op.repo.root, bundlefile) + bundlepath = "bundle:%s+%s" % (op.repo.root, + pycompat.fsencode(bundlefile))

• return date.strftime(opts['dateformat']) + return date.strftime(pycompat.sysstr(opts['dateformat']))

This appears to conflict with D3580.

Nit: name is no longer used.

+ $ hg commit -m changefunction
+ $ hg --cwd ../b --config notify.show-functions=True pull ../a

+ notify.show-functions
+ Set to True to get the equivalent of "hg diff --show-functions". Default:
+ False

REVISION SUMMARY

As far as I can tell, most of these failures are due to using $HGPORT, which it
seems chg might be using itself? I don't know enough to debug these failures to
fix them properly.

-def setup(repo):
+# Mapping of root:str to repo for repos that have the narrow requirement
+# specified.
+_rootrepomap = {}
+
+def _getrepo(ds):
+ """Check if narrow is enabled for repo associated with ds; return repo."""
+ return _rootrepomap.get(ds._root, None)

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py

• • a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -230,7 +230,6 @@ except IOError as inst: if inst.errno != errno.EPIPE: raise
• ret = -1 finally: duration = util.timer() - starttime req.ui.flush()

• • a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -1028,7 +1028,7 @@ ' which supports versions %s of Mercurial.\n' ' Please disable %s and try your action again.\n' '** If that fixes the bug please report it to %s\n')
• % (name, testedwith, name, report)) + % (name, testedwith, name, pycompat.bytestr(report)))

• elif isinstance(obj, str):
• # This branch is unreachable on Python 2, because bytes == str
• # and we'll return in the next-earlier block in the elif
• # ladder. On Python 3, this helps us catch bugs before they
• # hurt someone. + elif isinstance(obj, (str, pycompat.unicode)): + # On Python 2, we'll only get here if obj is unicode, because + # str == bytes, so str is handled above.

> I generally like the direction of this series, but I think there's no point
>  to extend Mercurial's exit code handling to support all weird Python types.
>
> Only ints and (None for 0) are ever valid.


The reason I did this is because from the context or `rhg`, we don't have CPython's default exit handling to fall back on. Our choices are:

1. Reimplement CPython's exit/error handling in Rust
2. Reimplement CPython's exit/error handling in Python in dispatch [so the end state is more well-defined]
3. Do something crude in `rhg` when we hit special cases that CPython would normally deal with.

Since extensions could do weird things, I figured 2 was the best option.

`unicode` is not a type on Python 3. I think this should be changed to `(str, pycompat.unicode)`.

+ def disambiguate(prefix):
+ """Disambiguate against revnums."""
+ hexnode = hex(node)
+ for length in range(len(prefix), 41):

+static int nt_shortest(indexObject *self, const char *node)
+{
+ int level, off;
+
+ if (nt_init(self) == -1)
+ return -3;
+ if (nt_populate(self) == -1)
+ return -3;
+
+ for (level = off = 0; level < 40; level++) {
+ int k, v;
+ nodetree *n = &self->nt[off];
+ k = nt_level(node, level);
+ v = n->children[k];
+ if (v < 0) {
+ v = -(v + 1);
+ const char *n = index_node(self, v);

Fixed as b'kvfile' in flight.

> > +        shelvectx = _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev,
> >  +                                          basename, pctx, tmpwctx,
> >  +                                          shelvectx, branchtorestore,
> >  +                                          activebookmark)
> > 
> >   overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
> >   with ui.configoverride(overrides, 'unshelve'):
>
> Maybe I'm wrong, but doesn't rebase do merge?


Correct, but we seem to be passing the tool explicitly to the rebase command on line 755.

+ shelvectx = _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev,
+ basename, pctx, tmpwctx,
+ shelvectx, branchtorestore,
+ activebookmark)

overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'unshelve'):

Looks generally good, but can you fix your editor to not do Google indent?

+ $ hg debugtemplate '{"foo/bar\nfoo/bar\n"|splitlines|commonprefix}\n'
+ foo

Please add tests of edge cases.