D10066: fuzz: if the caller of our makefile sets CC and CXX, trust them

2021-02-24 Thread durin42 (Augie Fackler) 
durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This should fix the broken fuzzing build, because we've been
  explicitly using clang++ but are now being given a CXX=afl++, which
  does extra stuff.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  contrib/fuzz/Makefile

CHANGE DETAILS

diff --git a/contrib/fuzz/Makefile b/contrib/fuzz/Makefile
--- a/contrib/fuzz/Makefile
+++ b/contrib/fuzz/Makefile
@@ -1,5 +1,5 @@
-CC = clang
-CXX = clang++
+CC ?= clang
+CXX ?= clang++
 
 # By default, use our own standalone_fuzz_target_runner.
 # This runner does no fuzzing, but simply executes the inputs



To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D10065: tests: correct a commit description in test-copies-chain-merge.t

2021-02-24 Thread martinvonz (Martin von Zweigbergk) 
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  tests/test-copies-chain-merge.t

CHANGE DETAILS

diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t
--- a/tests/test-copies-chain-merge.t
+++ b/tests/test-copies-chain-merge.t
@@ -78,7 +78,7 @@
   $ echo "original content for P" > p
   $ echo "original content for Q" > q
   $ echo "original content for R" > r
-  $ hg ci -Am 'i-0 initial commit: a b h'
+  $ hg ci -Am 'i-0 initial commit: a b h p q r'
   adding a
   adding b
   adding h
@@ -96,7 +96,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 And having another branch with renames on the other side
@@ -114,7 +114,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Have a branching with nothing on one side
@@ -131,7 +131,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Create a branch that delete a file previous renamed
@@ -148,7 +148,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Create a branch that delete a file previous renamed and recreate it
@@ -170,7 +170,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Having another branch renaming a different file to the same filename as another
@@ -191,7 +191,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
   $ hg up -q null
 
@@ -213,7 +213,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
   $ hg up -q null
 
@@ -235,7 +235,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
   $ hg up -q null
 
@@ -281,7 +281,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 
@@ -331,7 +331,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Comparing with a merge re-adding the file afterward
@@ -371,7 +371,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 
@@ -419,7 +419,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Subcase: new copy information on both side with an actual merge happening
@@ -462,7 +462,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Subcase: existing copy information overwritten on one branch
@@ -518,7 +518,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Subcase: existing copy information overwritten on one branch, with different 
content)
@@ -572,7 +572,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 
@@ -623,7 +623,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Subcase: merging a change to a file with a "copy overwrite" to that file from 
another branch
@@ -678,7 +678,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 
@@ -736,7 +736,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 
@@ -785,7 +785,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 
@@ -834,7 +834,7 @@
   | |
   o |  i-1: a -move-> c, p -move-> s
   |/
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Variant of previous with extra changes introduced by the merge
@@ -888,7 +888,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Decision from previous merge are properly chained with later merge
@@ -995,7 +995,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Subcase: chaining conflicting rename resolution, with actual merging happening
@@ -1094,7 +1094,7 @@
   |
   o  i-1: a -move-> c, p -move-> s
   |
-  o  i-0 initial commit: a b h
+  o  i-0 initial commit: a b h p q r
   
 
 Subcase: chaining salvage information during a merge
@@

Failed pipeline for branch/stable | mercurial-devel | c7116189

2021-02-24 Thread Heptapod 


Pipeline #18398 has failed!

Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel )
Branch: branch/stable ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/stable )

Commit: c7116189 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/commit/c711618993ac6c3a5bf62ef595e93b7338e97a71
 )
Commit Message: narrow: fix flaky behavior described in issue61...
Commit Author: Raphaël Gomès

Pipeline #18398 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/18398 ) triggered 
by Administrator ( https://foss.heptapod.net/root )
had 10 failed builds.

Job #170114 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170114/raw )

Stage: tests
Name: test-py3
Job #170115 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170115/raw )

Stage: tests
Name: test-py2-pure
Job #170117 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170117/raw )

Stage: tests
Name: test-py2-rust
Job #170119 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170119/raw )

Stage: tests
Name: test-py2-chg
Job #170118 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170118/raw )

Stage: tests
Name: test-py3-rust
Job #170113 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170113/raw )

Stage: tests
Name: test-py2
Job #170116 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170116/raw )

Stage: tests
Name: test-py3-pure
Job #170120 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170120/raw )

Stage: tests
Name: test-py3-chg
Job #170109 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170109/raw )

Stage: tests
Name: checks-py2
Job #170110 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170110/raw )

Stage: tests
Name: checks-py3

-- 
You're receiving this email because of your account on foss.heptapod.net.



___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

mercurial@46522: 2 new changesets (2 on stable)

2021-02-24 Thread Mercurial Commits 
2 new changesets (2 on stable) in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/ebc6d3484fdd
changeset:   46521:ebc6d3484fdd
branch:  stable
parent:  46493:b910be772eb9
user:Pierre-Yves David 
date:Wed Feb 24 15:16:22 2021 +0100
summary: re2: byteify some regex used to get check re2 availability

https://www.mercurial-scm.org/repo/hg/rev/6c8faeea6652
changeset:   46522:6c8faeea6652
branch:  stable
tag: tip
user:Matt Harbison 
date:Fri Feb 19 10:04:53 2021 -0500
summary: helptext: fix a recent typo

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Failed pipeline for branch/default | mercurial-devel | d3f8c2a4

2021-02-24 Thread Heptapod 


Pipeline #18397 has failed!

Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel )
Branch: branch/default ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/default )

Commit: d3f8c2a4 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/commit/d3f8c2a404d4db998598268a1a04dd6e678540cc
 )
Commit Message: revlog: add a mechanism to verify expected file...
Commit Author: Kyle Lippincott ( https://foss.heptapod.net/spectral )

Pipeline #18397 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/18397 ) triggered 
by Administrator ( https://foss.heptapod.net/root )
had 1 failed build.

Job #170104 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/170104/raw )

Stage: tests
Name: test-py2-rust

-- 
You're receiving this email because of your account on foss.heptapod.net.



___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D10064: re2: byteify some regex used to get check re2 availability

2021-02-24 Thread marmoute (Pierre-Yves David) 
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Changeset 687b865b95ad 
 
failed to properly byteify this because it was a raw
  string. This went undetected so far because re2 does not seems to be widely
  tested.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

AFFECTED FILES
  mercurial/util.py

CHANGE DETAILS

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -2170,7 +2170,7 @@
 global _re2
 try:
 # check if match works, see issue3964
-_re2 = bool(re2.match(r'\[([^\[]+)\]', b'[ui]'))
+_re2 = bool(re2.match(br'\[([^\[]+)\]', b'[ui]'))
 except ImportError:
 _re2 = False
 



To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel