# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1616919634 -7200
# Node ID 1bd2c4f147e19aa6c8d2cb3b9b553a331badb3d0
# Parent  22f4ebf3f7d8b9dd56c98a08ff02e58ef22c8d8f# Parent  5e62f3db141fdf4b54143905b6024d12ac587e9e
branching: merge stable into default

diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 Makefile
--- a/Makefile	Mon Mar 08 01:12:02 2021 +0530
+++ b/Makefile	Sun Mar 28 10:20:34 2021 +0200
@@ -1,4 +1,4 @@
-PYTHON ?= python
+PYTHON ?= python3
 VERSION = $(shell python setup.py --version)
 TESTFLAGS ?= $(shell echo $$HGTESTFLAGS)
 HGTESTS = $(HGROOT)/tests
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 hgext3rd/evolve/depthcache.py
--- a/hgext3rd/evolve/depthcache.py	Mon Mar 08 01:12:02 2021 +0530
+++ b/hgext3rd/evolve/depthcache.py	Sun Mar 28 10:20:34 2021 +0200
@@ -11,6 +11,7 @@
 
 import array
 
+from mercurial.i18n import _
 from mercurial import (
     localrepo,
     scmutil,
@@ -26,8 +27,6 @@
     utility,
 )
 
-from mercurial.i18n import _
-
 filterparents = utility.filterparents
 
 eh = exthelper.exthelper()
@@ -117,7 +116,7 @@
         def progress(pos, rev=None):
             revstr = b'' if rev is None else (b'rev %d' % rev)
             compat.progress(repo.ui, b'updating depth cache',
-                            pos, revstr, unit=b'revision', total=total)
+                            pos, revstr, unit=_(b'changesets'), total=total)
         progress(0)
         for idx, rev in enumerate(data, 1):
             assert rev == len(self._data), (rev, len(self._data))
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 hgext3rd/evolve/firstmergecache.py
--- a/hgext3rd/evolve/firstmergecache.py	Mon Mar 08 01:12:02 2021 +0530
+++ b/hgext3rd/evolve/firstmergecache.py	Sun Mar 28 10:20:34 2021 +0200
@@ -11,6 +11,7 @@
 
 import array
 
+from mercurial.i18n import _
 from mercurial import (
     localrepo,
     node as nodemod,
@@ -43,7 +44,7 @@
 
         @localrepo.unfilteredmethod
         def destroyed(self):
-            if r'firstmergecach' in vars(self):
+            if r'firstmergecache' in vars(self):
                 self.firstmergecache.clear()
             super(firstmergecacherepo, self).destroyed()
 
@@ -79,7 +80,7 @@
         def progress(pos, rev=None):
             revstr = b'' if rev is None else (b'rev %d' % rev)
             compat.progress(repo.ui, b'updating firstmerge cache',
-                            pos, revstr, unit=b'revision', total=total)
+                            pos, revstr, unit=_(b'changesets'), total=total)
         progress(0)
         for idx, rev in enumerate(data, 1):
             assert rev == len(self._data), (rev, len(self._data))
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 hgext3rd/evolve/genericcaches.py
--- a/hgext3rd/evolve/genericcaches.py	Mon Mar 08 01:12:02 2021 +0530
+++ b/hgext3rd/evolve/genericcaches.py	Sun Mar 28 10:20:34 2021 +0200
@@ -67,7 +67,7 @@
         Subclasses MUST overide this method to actually affect the cache data.
         """
         if reset:
-            self._cachekey = self.emptykey if reset else None
+            self._cachekey = self.emptykey
         else:
             self._cachekey = None
 
@@ -153,10 +153,9 @@
         """use a cachekey to fetch incremental data
 
         Exists as its own method to help subclass to reuse it."""
-        tiprev = len(cl) - 1
+        tiprev = cl.tiprev()
         tipnode = cl.node(tiprev)
         newkey = (tiprev, tipnode)
-        tiprev = len(cl) - 1
         if newkey == cachekey:
             return False, [], newkey
         keyrev, keynode = cachekey
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 hgext3rd/evolve/obscache.py
--- a/hgext3rd/evolve/obscache.py	Mon Mar 08 01:12:02 2021 +0530
+++ b/hgext3rd/evolve/obscache.py	Sun Mar 28 10:20:34 2021 +0200
@@ -137,7 +137,7 @@
         # /!\ IMPORTANT /!\
         # You must overide this method to actually
         if reset:
-            self._cachekey = self.emptykey if reset else None
+            self._cachekey = self.emptykey
         else:
             self._cachekey = None
 
@@ -195,7 +195,7 @@
         # update the key from the new data
         key = list(self._cachekey)
         if revs:
-            key[0] = len(cl) - 1
+            key[0] = cl.tiprev()
             key[1] = cl.node(key[0])
         if obsmarkers:
             key[2] += len(obsmarkers)
@@ -213,7 +213,7 @@
         ### Is the cache valid ?
         keytiprev, keytipnode, keyobslength, keyobssize, keyobskey = key
         # check for changelog strip
-        tiprev = len(changelog) - 1
+        tiprev = changelog.tiprev()
         if (tiprev < keytiprev
                 or changelog.node(keytiprev) != keytipnode):
             return None
@@ -251,7 +251,7 @@
             reset = True
             key = self.emptykey
             obssize, obskey = obsstore.cachekey()
-            tiprev = len(cl) - 1
+            tiprev = cl.tiprev()
         else:
             tiprev, obssize, obskey = status
 
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 hgext3rd/evolve/obsdiscovery.py
--- a/hgext3rd/evolve/obsdiscovery.py	Mon Mar 08 01:12:02 2021 +0530
+++ b/hgext3rd/evolve/obsdiscovery.py	Sun Mar 28 10:20:34 2021 +0200
@@ -22,6 +22,7 @@
 import struct
 import weakref
 
+from mercurial.i18n import _
 from mercurial import (
     encoding,
     error,
@@ -34,7 +35,6 @@
     store,
     util,
 )
-from mercurial.i18n import _
 
 from mercurial.utils.stringutil import forcebytestr
 
@@ -472,7 +472,7 @@
         def progress(pos, rev=None):
             revstr = b'' if rev is None else (b'rev %d' % rev)
             compat.progress(repo.ui, b'updating obshashrange cache',
-                            pos, revstr, unit=b'revision', total=total)
+                            pos, revstr, unit=_(b'changesets'), total=total)
         # warm the cache for the new revs
         progress(0)
         for idx, r in enumerate(revs):
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 hgext3rd/evolve/stablerange.py
--- a/hgext3rd/evolve/stablerange.py	Mon Mar 08 01:12:02 2021 +0530
+++ b/hgext3rd/evolve/stablerange.py	Sun Mar 28 10:20:34 2021 +0200
@@ -953,7 +953,7 @@
         starttime = util.timer()
 
         if upto is None:
-            upto = len(cl) - 1
+            upto = cl.tiprev()
         if self._tiprev is None:
             revs = cl.revs(stop=upto)
             nbrevs = upto + 1
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 hgext3rd/evolve/stablerangecache.py
--- a/hgext3rd/evolve/stablerangecache.py	Mon Mar 08 01:12:02 2021 +0530
+++ b/hgext3rd/evolve/stablerangecache.py	Sun Mar 28 10:20:34 2021 +0200
@@ -14,6 +14,7 @@
 import sqlite3
 import time
 
+from mercurial.i18n import _
 from mercurial import (
     commands,
     encoding,
@@ -34,8 +35,6 @@
     utility,
 )
 
-from mercurial.i18n import _
-
 eh = exthelper.exthelper()
 
 LONG_WARNING_TIME = 60
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 hgext3rd/evolve/stablesort.py
--- a/hgext3rd/evolve/stablesort.py	Mon Mar 08 01:12:02 2021 +0530
+++ b/hgext3rd/evolve/stablesort.py	Sun Mar 28 10:20:34 2021 +0200
@@ -250,6 +250,7 @@
 import collections
 import struct
 
+from mercurial.i18n import _
 from mercurial import (
     commands,
     error,
@@ -262,8 +263,6 @@
 
 from mercurial.utils.stringutil import forcebytestr
 
-from mercurial.i18n import _
-
 from . import (
     compat,
     depthcache,
@@ -337,11 +336,11 @@
     unfi = repo.unfiltered()
     revs = unfi.revs('all()')
     nbrevs = len(revs)
-    ui.write('number of revisions: %12d\n' % nbrevs)
+    ui.write(b'number of revisions: %12d\n' % nbrevs)
     merge = unfi.revs('merge()')
     nbmerge = len(merge)
     cache = unfi.stablesort
-    ui.write('number of merge:     %12d\n' % nbmerge)
+    ui.write(b'number of merge:     %12d\n' % nbmerge)
     alljumps = []
     alljumpssize = []
     for r in merge:
@@ -352,20 +351,20 @@
         alljumps.append(jumps)
         alljumpssize.append(len(jumps))
     nbjumps = sum(alljumpssize)
-    ui.write('number of jumps:     %12d\n' % nbjumps)
+    ui.write(b'number of jumps:     %12d\n' % nbjumps)
     if not nbjumps:
         return 0
     avgjumps = nbjumps / float(len(alljumpssize))
-    ui.write('average jumps:                 %6.3f\n' % avgjumps)
+    ui.write(b'average jumps:                 %6.3f\n' % avgjumps)
     alljumpssize.sort()
     medianjumps = alljumpssize[len(alljumpssize) // 2]
-    ui.write('median jumps:        %12d\n' % medianjumps)
+    ui.write(b'median jumps:        %12d\n' % medianjumps)
     tensjumps = alljumpssize[len(alljumpssize) * 9 // 10]
-    ui.write('90%% jumps:           %12d\n' % tensjumps)
+    ui.write(b'90%% jumps:           %12d\n' % tensjumps)
     centsjumps = alljumpssize[len(alljumpssize) * 99 // 100]
-    ui.write('99%% jumps:           %12d\n' % centsjumps)
-    ui.write('max jumps:           %12d\n' % max(alljumpssize))
-    ui.write('jump cache size:     %12d bytes\n' % (nbjumps * 12))
+    ui.write(b'99%% jumps:           %12d\n' % centsjumps)
+    ui.write(b'max jumps:           %12d\n' % max(alljumpssize))
+    ui.write(b'jump cache size:     %12d bytes\n' % (nbjumps * 12))
 
 def stablesort_branchpoint(repo, revs, mergecallback=None):
     """return '::revs' topologically sorted in "stable" order
@@ -864,7 +863,7 @@
         def progress(pos, rev=None):
             revstr = b'' if rev is None else (b'rev %d' % rev)
             compat.progress(repo.ui, b'updating stablesort cache',
-                            pos, revstr, unit=b'revision', total=total)
+                            pos, revstr, unit=_(b'changesets'), total=total)
 
         progress(0)
         for idx, rev in enumerate(data):
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 tests/test-discovery-obshashrange-cache.t
--- a/tests/test-discovery-obshashrange-cache.t	Mon Mar 08 01:12:02 2021 +0530
+++ b/tests/test-discovery-obshashrange-cache.t	Sun Mar 28 10:20:34 2021 +0200
@@ -7,7 +7,7 @@
 
   $ cat << EOF >> $HGRCPATH
   > [extensions]
-  > hgext3rd.evolve =
+  > evolve =
   > blackbox =
   > [defaults]
   > blackbox = -l 100
@@ -17,8 +17,6 @@
   > [ui]
   > logtemplate = "{rev} {node|short} {desc} {tags}\n"
   > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh"
-  > [alias]
-  > debugobsolete=debugobsolete -d '0 0'
   > EOF
 
   $ hg init main
@@ -26,9 +24,7 @@
   $ hg -R main debugbuilddag '.+7'
 
   $ for node in `hg -R main log -T '{node}\n'`; do
-  >     printf $node | grep -o . | sort |tr -d "\n" > ancfile
-  >     anc=`cat ancfile`
-  >     rm ancfile
+  >     anc=`echo $node | grep -o . | sort | tr -d "\n"`
   >     echo "marking $anc as predecessors of $node"
   >     hg -R main debugobsolete $anc $node
   > done
@@ -80,7 +76,7 @@
   remote: added 8 changesets with 0 changes to 0 files
   remote: 8 new obsolescence markers
 
-sever cash is warm
+server cache is warm
 
   $ f -s server/.hg/cache/evoext*
   server/.hg/cache/evoext-depthcache-00: size=88
@@ -90,7 +86,7 @@
   server/.hg/cache/evoext_obshashrange_v2.sqlite: size=?* (glob)
   server/.hg/cache/evoext_stablerange_v2.sqlite: size=?* (glob)
 
-client cash is warm
+client cache is warm
 
   $ f -s main/.hg/cache/evoext*
   main/.hg/cache/evoext-depthcache-00: size=88
@@ -136,7 +132,7 @@
   no changes found
   OBSEXC: looking for common markers in 8 nodes
 
-client cash is warm
+client cache is warm
 
   $ f -s main/.hg/cache/evoext*
   main/.hg/cache/evoext-depthcache-00: size=88
@@ -164,7 +160,7 @@
   no changes found
   [1]
 
-client cash is warm
+client cache is warm
 
   $ f -s main/.hg/cache/evoext*
   main/.hg/cache/evoext-depthcache-00: size=88
diff -r 22f4ebf3f7d8 -r 1bd2c4f147e1 tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Mon Mar 08 01:12:02 2021 +0530
+++ b/tests/test-discovery-obshashrange.t	Sun Mar 28 10:20:34 2021 +0200
@@ -5,7 +5,7 @@
 
   $ cat << EOF >> $HGRCPATH
   > [extensions]
-  > hgext3rd.evolve =
+  > evolve =
   > blackbox =
   > [defaults]
   > blackbox = -l 100
@@ -18,8 +18,6 @@
   > [ui]
   > logtemplate = "{rev} {node|short} {desc} {tags}\n"
   > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh"
-  > [alias]
-  > debugobsolete=debugobsolete -d '0 0'
   > EOF
 
   $ getid() {
@@ -84,27 +82,21 @@
   * @0000000000000000000000000000000000000000 (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
   * @0000000000000000000000000000000000000000 (*)> log -G exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd (glob)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 --config *experimental.obshashrange.max-revs=1* (glob)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 --config *experimental.obshashrange.max-revs=1* exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d (glob)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 --config *experimental.obshashrange.warm-cache=0* (glob)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 --config *experimental.obshashrange.warm-cache=0* exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd (glob)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete (glob)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
   $ rm .hg/blackbox.log
@@ -309,7 +301,6 @@
   ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   $ hg blackbox
   * @0000000000000000000000000000000000000000 (*)> debugobsolete (glob)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> debugobsolete exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> up (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> up exited 0 after *.?? seconds (glob)
@@ -320,7 +311,6 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> commit -m foo exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug (glob)
@@ -379,11 +369,9 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete 111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push (glob)
@@ -437,16 +425,13 @@
   $ hg -R ../server blackbox
   * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev '::tip' (glob) (no-windows !)
   * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev ::tip (glob) (windows !)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
   * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev '::tip' exited 0 after *.?? seconds (glob) (no-windows !)
   * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev ::tip exited 0 after *.?? seconds (glob) (windows !)
   * @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd (glob)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d (glob)
-  * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
@@ -466,7 +451,6 @@
   dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   $ hg blackbox
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G exited 0 after *.?? seconds (glob)
@@ -542,7 +526,6 @@
   $ hg blackbox
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete --rev '::6' (glob) (no-windows !)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete --rev ::6 (glob) (windows !)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete --rev '::6' exited 0 after *.?? seconds (glob) (no-windows !)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete --rev ::6 exited 0 after *.?? seconds (glob) (windows !)