Patchwork D5813: revset: add expect to check the size of a set

login
register
mail settings
Submitter phabricator
Date Feb. 10, 2019, 5:19 a.m.
Message ID <08b81e5a990115994f9332b2491a94ab@localhost.localdomain>
Download mbox | patch
Permalink /patch/38645/
State Not Applicable
Headers show

Comments

phabricator - Feb. 10, 2019, 5:19 a.m.
navaneeth.suresh updated this revision to Diff 14000.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5813?vs=13899&id=14000

REVISION DETAIL
  https://phab.mercurial-scm.org/D5813

AFFECTED FILES
  mercurial/revset.py
  tests/test-revset.t

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: yuja, pulkit, durin42, mjpieters, mercurial-devel
Yuya Nishihara - Feb. 11, 2019, 2:12 a.m.
Getting close.

On Sun, 10 Feb 2019 05:19:55 +0000, navaneeth.suresh (Navaneeth Suresh) wrote:
> +  $ log 'expectsize(0:2, 2:4)'

Can you test `:max`, `min:`, and `:` (no constraint)?
They shouldn't fail.

> +@predicate('expectsize(set[, size])', safe=True, takeorder=True)
> +def expectrevsetsize(repo, subset, x, order):
> +    """Abort if the revset doesn't expect given size"""
> +    args = getargsdict(x, 'expect', 'set size')
> +    size = args.get('size')
> +    minsize = None
> +    maxsize = None
> +    err = ''
> +    if size is not None:
> +        minsize, maxsize = getintrange(size,
> +                                       _('expectsize requires a size range'
> +                                         ' or a positive integer'),
> +                                       _('size range bounds must be integers'))
> +        if minsize < 0 or maxsize < 0:
> +            raise error.ParseError(_('negative size'))
> +    if size is None or 'set' not in args:
> +        raise error.ParseError(_('invalid set of arguments'))

Nit: `if size is not None` (and the `size` variable itself) can be removed
if we checked the invalid set of arguments first.
phabricator - Feb. 11, 2019, 2:16 a.m.
yuja added a comment.


  Getting close.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5813

To: navaneeth.suresh, #hg-reviewers
Cc: yuja, pulkit, durin42, mjpieters, mercurial-devel

Patch

diff --git a/tests/test-revset.t b/tests/test-revset.t
--- a/tests/test-revset.t
+++ b/tests/test-revset.t
@@ -2950,3 +2950,45 @@ 
   * set:
   <baseset+ [0]>
   0
+
+abort if the revset doesn't expect given size
+  $ log 'expectsize()'
+  hg: parse error: invalid set of arguments
+  [255]
+  $ log 'expectsize(0:2, a)'
+  hg: parse error: expectsize requires a size range or a positive integer
+  [255]
+  $ log 'expectsize(0:2, 3)'
+  0
+  1
+  2
+
+  $ log 'expectsize(2:0, 3)'
+  2
+  1
+  0
+  $ log 'expectsize(0:1, 1)'
+  abort: revset size mismatch. expected 1, got 2!
+  [255]
+  $ log 'expectsize(0:4, -1)'
+  hg: parse error: negative size
+  [255]
+  $ log 'expectsize(0:2, 2:4)'
+  0
+  1
+  2
+  $ log 'expectsize(0:1, 3:5)'
+  abort: revset size mismatch. expected between 3 and 5, got 2!
+  [255]
+  $ log 'expectsize(0:1, -1:2)'
+  hg: parse error: negative size
+  [255]
+  $ log 'expectsize(0:1, 1:-2)'
+  hg: parse error: negative size
+  [255]
+  $ log 'expectsize(0:2, a:4)'
+  hg: parse error: size range bounds must be integers
+  [255]
+  $ log 'expectsize(0:2, 2:b)'
+  hg: parse error: size range bounds must be integers
+  [255]
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -815,6 +815,38 @@ 
     contentdivergent = obsmod.getrevs(repo, 'contentdivergent')
     return subset & contentdivergent
 
+@predicate('expectsize(set[, size])', safe=True, takeorder=True)
+def expectrevsetsize(repo, subset, x, order):
+    """Abort if the revset doesn't expect given size"""
+    args = getargsdict(x, 'expect', 'set size')
+    size = args.get('size')
+    minsize = None
+    maxsize = None
+    err = ''
+    if size is not None:
+        minsize, maxsize = getintrange(size,
+                                       _('expectsize requires a size range'
+                                         ' or a positive integer'),
+                                       _('size range bounds must be integers'))
+        if minsize < 0 or maxsize < 0:
+            raise error.ParseError(_('negative size'))
+    if size is None or 'set' not in args:
+        raise error.ParseError(_('invalid set of arguments'))
+    rev = getset(repo, fullreposet(repo), args['set'], order=order)
+    if minsize != maxsize and (len(rev) < minsize or len(rev) > maxsize):
+        err = _('revset size mismatch.'
+                ' expected between %d and %d, got %d') % (minsize, maxsize,
+                                                          len(rev))
+    elif minsize == maxsize and len(rev) != minsize:
+        err = _('revset size mismatch.'
+                ' expected %d, got %d') % (minsize, len(rev))
+    if err:
+        raise error.RepoLookupError(err)
+    if order == followorder:
+        return subset & rev
+    else:
+        return rev & subset
+
 @predicate('extdata(source)', safe=False, weight=100)
 def extdata(repo, subset, x):
     """Changesets in the specified extdata source. (EXPERIMENTAL)"""