--- a/hgext3rd/evolve/metadata.py Thu Aug 16 11:54:30 2018 +0200
+++ b/hgext3rd/evolve/metadata.py Thu Aug 16 11:58:07 2018 +0200
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-__version__ = '8.1.1.dev'
+__version__ = '8.2.0.dev'
testedwith = '4.3.2 4.4.2 4.5.2 4.6.2 4.7'
minimumhgversion = '4.3'
buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Thu Aug 16 11:54:30 2018 +0200
+++ b/hgext3rd/topic/__init__.py Thu Aug 16 11:58:07 2018 +0200
@@ -132,7 +132,6 @@
registrar,
scmutil,
templatefilters,
- templatekw,
util,
)
@@ -181,7 +180,7 @@
'topic.active': 'green',
}
-__version__ = '0.10.1.dev'
+__version__ = '0.11.0.dev'
testedwith = '4.3.3 4.4.2 4.5.2 4.6.2 4.7'
minimumhgversion = '4.3'
@@ -231,6 +230,8 @@
default=None,
)
+templatekeyword = registrar.templatekeyword()
+
def _contexttopic(self, force=False):
if not (force or self.mutable()):
return ''
@@ -338,7 +339,6 @@
cmdutil.summaryhooks.add('topic', summaryhook)
- templatekw.keywords['topic'] = topickw
# Wrap workingctx extra to return the topic name
extensions.wrapfunction(context.workingctx, '__init__', wrapinit)
# Wrap changelog.add to drop empty topic
@@ -510,9 +510,11 @@
'topics', 'topic', namemap=_namemap, nodemap=_nodemap,
listnames=lambda repo: repo.topics))
-def topickw(**args):
+@templatekeyword('topic', requires={'ctx'})
+def topickw(context, mapping):
""":topic: String. The topic of the changeset"""
- return args['ctx'].topic()
+ ctx = context.resource(mapping, 'ctx')
+ return ctx.topic()
def wrapinit(orig, self, repo, *args, **kwargs):
orig(self, repo, *args, **kwargs)
--- a/tests/test-discovery-obshashrange.t Thu Aug 16 11:54:30 2018 +0200
+++ b/tests/test-discovery-obshashrange.t Thu Aug 16 11:58:07 2018 +0200
@@ -876,3 +876,31 @@
5 c8d03c1b5e94 5 1 6 446c2dc3bce5
6 f69452c5b1af 6 1 7 000000000000
+Cache warming capabilities
+--------------------------
+
+ $ hg config experimental.obshashrange
+ 1
+ $ hg config experimental.obshashrange.warm-cache
+ [1]
+ $ hg debugupdatecache
+ $ ls -1 .hg/cache/evoext*
+ .hg/cache/evoext-depthcache-00
+ .hg/cache/evoext-firstmerge-00
+ .hg/cache/evoext-obscache-00
+ .hg/cache/evoext-stablesortcache-00
+ .hg/cache/evoext_obshashrange_v2.sqlite
+ .hg/cache/evoext_stablerange_v2.sqlite
+ $ rm -f .hg/cache/evoext*
+ $ ls -1 .hg/cache/ | grep evoext
+ [1]
+ $ hg debugupdatecache --debug
+ updating the branch cache
+ invalid branchheads cache (served): tip differs
+ $ f -s .hg/cache/evoext*
+ .hg/cache/evoext-depthcache-00: size=96
+ .hg/cache/evoext-firstmerge-00: size=96
+ .hg/cache/evoext-obscache-00: size=73
+ .hg/cache/evoext-stablesortcache-00: size=100
+ .hg/cache/evoext_obshashrange_v2.sqlite: size=??* (glob)
+ .hg/cache/evoext_stablerange_v2.sqlite: size=??* (glob)
--- a/tests/test-evolve.t Thu Aug 16 11:54:30 2018 +0200
+++ b/tests/test-evolve.t Thu Aug 16 11:58:07 2018 +0200
@@ -1164,55 +1164,11 @@
> EOF
$ hg next
hg: unknown command 'next'
- Mercurial Distributed SCM
-
- basic commands:
-
- add add the specified files on the next commit
- annotate show changeset information by line for each file
- clone make a copy of an existing repository
- commit commit the specified files or all outstanding changes
- diff diff repository (or selected files)
- export dump the header and diffs for one or more changesets
- forget forget the specified files on the next commit
- init create a new repository in the given directory
- log show revision history of entire repository or files
- merge merge another revision into working directory
- pull pull changes from the specified source
- push push changes to the specified destination
- remove remove the specified files on the next commit
- serve start stand-alone webserver
- status show changed files in the working directory
- summary summarize working directory state
- update update working directory (or switch revisions)
-
- (use 'hg help' for the full list of commands or 'hg -v' for details)
+ (use 'hg help' for a list of commands)
[255]
$ hg fold
hg: unknown command 'fold'
- Mercurial Distributed SCM
-
- basic commands:
-
- add add the specified files on the next commit
- annotate show changeset information by line for each file
- clone make a copy of an existing repository
- commit commit the specified files or all outstanding changes
- diff diff repository (or selected files)
- export dump the header and diffs for one or more changesets
- forget forget the specified files on the next commit
- init create a new repository in the given directory
- log show revision history of entire repository or files
- merge merge another revision into working directory
- pull pull changes from the specified source
- push push changes to the specified destination
- remove remove the specified files on the next commit
- serve start stand-alone webserver
- status show changed files in the working directory
- summary summarize working directory state
- update update working directory (or switch revisions)
-
- (use 'hg help' for the full list of commands or 'hg -v' for details)
+ (use 'hg help' for a list of commands)
[255]
Enabling commands selectively, only fold enabled, next is still unknown
$ cat >> $HGRCPATH <<EOF
@@ -1225,30 +1181,7 @@
[255]
$ hg next
hg: unknown command 'next'
- Mercurial Distributed SCM
-
- basic commands:
-
- add add the specified files on the next commit
- annotate show changeset information by line for each file
- clone make a copy of an existing repository
- commit commit the specified files or all outstanding changes
- diff diff repository (or selected files)
- export dump the header and diffs for one or more changesets
- fold fold multiple revisions into a single one
- forget forget the specified files on the next commit
- init create a new repository in the given directory
- log show revision history of entire repository or files
- merge merge another revision into working directory
- pull pull changes from the specified source
- push push changes to the specified destination
- remove remove the specified files on the next commit
- serve start stand-alone webserver
- status show changed files in the working directory
- summary summarize working directory state
- update update working directory (or switch revisions)
-
- (use 'hg help' for the full list of commands or 'hg -v' for details)
+ (use 'hg help' for a list of commands)
[255]
Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
--- a/tests/test-options.t Thu Aug 16 11:54:30 2018 +0200
+++ b/tests/test-options.t Thu Aug 16 11:58:07 2018 +0200
@@ -26,5 +26,4 @@
> EOF
$ hg prune | head -n 2
hg: unknown command 'prune'
- Mercurial Distributed SCM
-
+ (use 'hg help' for a list of commands)