Patchwork [6,of,7,STABLE] avoid warning against "reverting subrepo ..." lines

mail settings
Submitter Katsunori FUJIWARA
Date Jan. 21, 2015, 3:10 p.m.
Message ID <e6797a86b8c3b05aedfc.1421853053@juju>
Download mbox | patch
Permalink /patch/7530/
State Accepted
Commit 30b016ef4bd896c606a3f70bbe3c4b804f21d2ea
Headers show


Katsunori FUJIWARA - Jan. 21, 2015, 3:10 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <>
# Date 1421853026 -32400
#      Thu Jan 22 00:10:26 2015 +0900
# Branch stable
# Node ID e6797a86b8c3b05aedfc7d0b1fccda0f476cae87
# Parent  ef59640c1ab192e862b54b9530c3dc281371caf5 avoid warning against "reverting subrepo ..." lines

Before this patch, "reverting subrepo subrepo/path" lines in *.t test
files require "(glob)", because such lines are recognized as
"reverting path/to/managed/file" by "".

On the other hand, "(glob)" for such "reverting ..." line is
recognized as useless by "", because subrepo paths shown
in such lines are always normalized by "util.pconvert". And this
causes "no result code from test" warning.

As a preparation for discarding "(glob)" from such lines in subsequent
patch, this patch avoids warning against them, by adding negative
lookahead assertion "(?!subrepo )" to the regexp.


diff --git a/contrib/ b/contrib/
--- a/contrib/
+++ b/contrib/
@@ -159,7 +159,7 @@  utestpats = [
     (r'^  pulling from \$TESTTMP/.*[^)]$', winglobmsg,
      '\$TESTTMP/unix-repo$'), # in test-issue1802.t which skipped on windows
-    (r'^  reverting .*/.*[^)]$', winglobmsg),
+    (r'^  reverting (?!subrepo ).*/.*[^)]$', winglobmsg),
     (r'^  cloning subrepo \S+/.*[^)]$', winglobmsg),
     (r'^  pushing to \$TESTTMP/.*[^)]$', winglobmsg),
     (r'^  pushing subrepo \S+/\S+ to.*[^)]$', winglobmsg),