mercurial-devel | Pipeline #16765 has failed for branch/default | 30b17212
Your pipeline 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: 30b17212 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/30b1721231228b3bb146064aa3d15b4208a5e735 ) Commit Message: tests: skip a detailed exit status in test-lfs-... Commit Author: Matt Harbison Pipeline #16765 ( https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/16765 ) triggered by Administrator ( https://foss.heptapod.net/root ) had 1 failed build. Job #154367 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/154367/raw ) Stage: tests Name: test-py2-chg -- 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
D9836: tests: skip a detailed exit status in test-lfs-test-server
mharbison72 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The mode of failure here differs between `lfs-test-server` and `hg serve`, and they each throw a different exception. The `hg serve` case raises a subclass of `StorageError`, which gets a detailed status. The `lfs-test-server` case raises a subclass of `Abort`, which does not. Since the exit code isn't currently conditionizable in the tests, this is the simplest way to avoid the failure. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL https://phab.mercurial-scm.org/D9836 AFFECTED FILES tests/test-lfs-test-server.t CHANGE DETAILS diff --git a/tests/test-lfs-test-server.t b/tests/test-lfs-test-server.t --- a/tests/test-lfs-test-server.t +++ b/tests/test-lfs-test-server.t @@ -420,7 +420,10 @@ TODO: give the proper error indication from `hg serve` - $ hg --repo ../repo1 update -C tip --debug +TODO: reconsider the except base class so that the git and hg errors yield the +same exit status. + + $ hg --repo ../repo1 update -C tip --debug --config ui.detailed-exit-code=False http auth: user foo, password *** resolving manifests branchmerge: False, force: True, partial: False @@ -460,7 +463,7 @@ Date: $HTTP_DATE$ (git-server !) abort: corrupt remote lfs object: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (git-server !) abort: LFS server error for "c": Validation error (hg-server !) - [50] + [255] The corrupted blob is not added to the usercache or local store To: mharbison72, #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
D9835: resolve: also detect new :mergediff conflict markers
martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The conflict markers created by `:mergediff` were not detected as conflicts, which affects both `commands.resolve.mark-check` and `mergetools..check`. This patch fixes that. The new regex it uses for finding conflict markers is less restrictive because it `:mergediff` doesn't follow the `<<<` and `>>>` lines by a space (and a description). Hopefully lines like that don't give too many false positives. We can add back the space and make `:mergediff` add trailing spaces if it turns out to be a problem. OTOH, there will always be some false positives and we have ways of overriding the checks already. This patch can go onto the default or stable branch, depending on how much we care about an experimental feature. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9835 AFFECTED FILES mercurial/filemerge.py tests/test-resolve.t CHANGE DETAILS diff --git a/tests/test-resolve.t b/tests/test-resolve.t --- a/tests/test-resolve.t +++ b/tests/test-resolve.t @@ -344,6 +344,24 @@ $ hg resolve -l R file1 R file2 +Test with :mergediff conflict markers + $ hg resolve --unmark + $ hg resolve --re-merge -t :mergediff file2 + merging file2 + warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') + [1] + $ hg resolve -l + U file1 + U file2 + $ hg --config commands.resolve.mark-check=abort resolve -m + warning: the following files still have conflict markers: +file2 + abort: conflict markers detected + (use --all to mark anyway) + [20] + $ hg resolve -l + U file1 + U file2 Test option value 'warn' $ hg resolve --unmark $ hg resolve -l diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -1195,7 +1195,11 @@ def hasconflictmarkers(data): return bool( -re.search(b"^(<<< .*|===|>>> .*)$", data, re.MULTILINE) +re.search( +br"^(<<<.*|===|--- .*|\+\+\+\+\+\+\+ .*|>>>.*)$", +data, +re.MULTILINE, +) ) To: martinvonz, #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
mercurial@46341: 7 new changesets (3 on stable)
7 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/25be21ec6c65 changeset: 46335:25be21ec6c65 parent: 46331:8788981c95f8 user:Pulkit Goyal <7895pul...@gmail.com> date:Mon Jan 18 21:37:20 2021 +0530 summary: share: rework config options to be much clearer and easier https://www.mercurial-scm.org/repo/hg/rev/4f17773fc6b5 changeset: 46336:4f17773fc6b5 user:Pulkit Goyal <7895pul...@gmail.com> date:Fri Jan 15 12:08:07 2021 +0530 summary: share: rename share-safe warning config https://www.mercurial-scm.org/repo/hg/rev/6e81446bf1d9 changeset: 46337:6e81446bf1d9 user:Pulkit Goyal <7895pul...@gmail.com> date:Mon Jan 18 19:16:49 2021 +0530 summary: share: move share safe functionality out of experimental https://www.mercurial-scm.org/repo/hg/rev/9da65e3cf370 changeset: 46338:9da65e3cf370 branch: stable tag: 5.7rc0 parent: 46337:6e81446bf1d9 parent: 46147:b308d750de82 user:Pulkit Goyal <7895pul...@gmail.com> date:Tue Jan 19 21:48:43 2021 +0530 summary: merge with stable https://www.mercurial-scm.org/repo/hg/rev/8814c0d20245 changeset: 46339:8814c0d20245 branch: stable user:Pulkit Goyal <7895pul...@gmail.com> date:Tue Jan 19 22:37:09 2021 +0530 summary: Added tag 5.7rc0 for changeset 9da65e3cf370 https://www.mercurial-scm.org/repo/hg/rev/7e44d5ca2a2f changeset: 46340:7e44d5ca2a2f branch: stable user:Pulkit Goyal <7895pul...@gmail.com> date:Tue Jan 19 22:37:35 2021 +0530 summary: Added signature for changeset 9da65e3cf370 https://www.mercurial-scm.org/repo/hg/rev/3b1c0c367606 changeset: 46341:3b1c0c367606 bookmark:@ tag: tip parent: 46334:4b0192f592cf parent: 46340:7e44d5ca2a2f user:Augie Fackler date:Tue Jan 19 12:22:05 2021 -0500 summary: merge with stable -- 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
D9834: black: merge config into main pyproject.toml now that we have it
durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
This means that naive contributors who just run `black` on a source file
will get reasonable behavior as long as they have a recent black. Yay!
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D9834
AFFECTED FILES
black.toml
contrib/examples/fix.hgrc
pyproject.toml
tests/test-check-code.t
tests/test-check-format.t
CHANGE DETAILS
diff --git a/tests/test-check-format.t b/tests/test-check-format.t
--- a/tests/test-check-format.t
+++ b/tests/test-check-format.t
@@ -1,5 +1,5 @@
#require black test-repo
$ cd $RUNTESTDIR/..
- $ black --config=black.toml --check --diff `hg files 'set:(**.py +
grep("^#!.*python")) - mercurial/thirdparty/**'`
+ $ black --check --diff `hg files 'set:(**.py + grep("^#!.*python")) -
mercurial/thirdparty/**'`
diff --git a/tests/test-check-code.t b/tests/test-check-code.t
--- a/tests/test-check-code.t
+++ b/tests/test-check-code.t
@@ -65,7 +65,6 @@
COPYING
Makefile
README.rst
- black.toml
hg
hgeditor
hgweb.cgi
diff --git a/pyproject.toml b/pyproject.toml
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,18 @@
[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta"
+
+[tool.black]
+line-length = 80
+exclude = '''
+build/
+| wheelhouse/
+| dist/
+| packages/
+| \.hg/
+| \.mypy_cache/
+| \.venv/
+| mercurial/thirdparty/
+'''
+skip-string-normalization = true
+quiet = true
diff --git a/contrib/examples/fix.hgrc b/contrib/examples/fix.hgrc
--- a/contrib/examples/fix.hgrc
+++ b/contrib/examples/fix.hgrc
@@ -5,7 +5,7 @@
rustfmt:command = rustfmt +nightly
rustfmt:pattern = set:"**.rs" - "mercurial/thirdparty/**"
-black:command = black --config=black.toml -
+black:command = black
black:pattern = set:**.py - mercurial/thirdparty/**
# Mercurial doesn't have any Go code, but if we did this is how we
diff --git a/black.toml b/black.toml
deleted file mode 100644
--- a/black.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[tool.black]
-line-length = 80
-exclude = '''
-build/
-| wheelhouse/
-| dist/
-| packages/
-| \.hg/
-| \.mypy_cache/
-| \.venv/
-| mercurial/thirdparty/
-'''
-skip-string-normalization = true
-quiet = true
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
D9833: pyproject: add config file
durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will tell pip et al to call our setup.py for the majority of packaging concerns, but also gives us a place to put standard config stuff like black. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9833 AFFECTED FILES pyproject.toml tests/test-check-code.t CHANGE DETAILS diff --git a/tests/test-check-code.t b/tests/test-check-code.t --- a/tests/test-check-code.t +++ b/tests/test-check-code.t @@ -69,6 +69,7 @@ hg hgeditor hgweb.cgi + pyproject.toml rustfmt.toml setup.py diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" 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
mercurial-devel | Pipeline #16733 has failed for branch/default | a8fe0ed0
Your pipeline 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: a8fe0ed0 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/a8fe0ed0dc9e68695541735012439020466a3d4a ) Commit Message: share: move share safe functionality out of exp... Commit Author: Pulkit Goyal ( https://foss.heptapod.net/pulkit.goyal ) Pipeline #16733 ( https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/16733 ) triggered by Pierre-Yves David ( https://foss.heptapod.net/marmoute ) had 1 failed build. Job #154075 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/154075/raw ) Stage: tests Name: test-py2-chg -- 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@46334: 93 new changesets
93 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/cb12658bf0e1 changeset: 46242:cb12658bf0e1 user:Pulkit Goyal <7895pul...@gmail.com> date:Tue Dec 08 16:41:13 2020 +0530 summary: scmutil: improve documentation of writereporequirements() https://www.mercurial-scm.org/repo/hg/rev/63c923fd7fa8 changeset: 46243:63c923fd7fa8 user:Dan Villiom Podlaski Christiansen date:Mon Dec 21 15:50:01 2020 +0100 summary: setup: when possible, build and bundle man pages https://www.mercurial-scm.org/repo/hg/rev/fb69b51b4daa changeset: 46244:fb69b51b4daa user:Dan Villiom Podlaski Christiansen date:Mon Jan 11 15:16:36 2021 +0100 summary: ci: avoid a global before_script definition https://www.mercurial-scm.org/repo/hg/rev/db2bc9e667a1 changeset: 46245:db2bc9e667a1 user:Dan Villiom Podlaski Christiansen date:Tue Dec 29 23:15:26 2020 +0100 summary: rust: fix testing with $TMPDIR ≠ /tmp https://www.mercurial-scm.org/repo/hg/rev/416ecdaa12df changeset: 46246:416ecdaa12df user:Kyle Lippincott date:Mon Jan 11 17:46:55 2021 -0800 summary: patch: handle filenames with trailing spaces https://www.mercurial-scm.org/repo/hg/rev/a3ccbac659d8 changeset: 46247:a3ccbac659d8 user:Pierre-Yves David date:Tue Jan 12 23:27:24 2021 +0100 summary: narrow: overwrite readfast in excludeddirmanifestctx https://www.mercurial-scm.org/repo/hg/rev/7488067b8c1e changeset: 46248:7488067b8c1e user:Pierre-Yves David date:Tue Jan 12 18:19:01 2021 +0100 summary: persistent-nodemap: test that is it present after a clone https://www.mercurial-scm.org/repo/hg/rev/3eb33aa237c0 changeset: 46249:3eb33aa237c0 user:Pierre-Yves David date:Tue Jan 12 18:19:17 2021 +0100 summary: persistent-nodemap: test it (does not) exist after a local clone https://www.mercurial-scm.org/repo/hg/rev/de2ed219fd00 changeset: 46250:de2ed219fd00 user:Pierre-Yves David date:Tue Jan 12 18:13:55 2021 +0100 summary: persistent-nodemap: test it (does not) exist after a stream clone https://www.mercurial-scm.org/repo/hg/rev/40ec2173f4dd changeset: 46251:40ec2173f4dd user:Pierre-Yves David date:Tue Jan 12 19:47:34 2021 +0100 summary: persistent-nodemap: highlight that node is not sent when streaming https://www.mercurial-scm.org/repo/hg/rev/8023991dc811 changeset: 46252:8023991dc811 user:Pierre-Yves David date:Wed Jan 13 12:50:47 2021 +0100 summary: upgrade: explicitly test for revlog index https://www.mercurial-scm.org/repo/hg/rev/1cebad969d88 changeset: 46253:1cebad969d88 user:Pierre-Yves David date:Tue Jan 12 19:49:18 2021 +0100 summary: persistent-nodemap: also list related file as part of the store https://www.mercurial-scm.org/repo/hg/rev/c4b792fa109e changeset: 46254:c4b792fa109e user:Joerg Sonnenberger date:Fri Dec 18 14:45:28 2020 +0100 summary: branchmap: avoid ancestor computations in absence of non-continous branches https://www.mercurial-scm.org/repo/hg/rev/cce05a6c271f changeset: 46255:cce05a6c271f user:Pierre-Yves David date:Wed Jan 13 17:21:51 2021 +0100 summary: perf: don't turn byte to string when formatting perfbranchmap https://www.mercurial-scm.org/repo/hg/rev/eb981412d91e changeset: 46256:eb981412d91e user:Raphaël Gomès date:Fri Jan 08 16:25:18 2021 +0100 summary: contrib: remove testing for `dirstate-tree` Rust feature https://www.mercurial-scm.org/repo/hg/rev/b918494198f7 changeset: 46257:b918494198f7 user:Augie Fackler date:Wed Jan 13 15:44:24 2021 -0500 summary: fuzz: try and ensure fuzzer tests run against the right python-config https://www.mercurial-scm.org/repo/hg/rev/b4c88c7daa4f changeset: 46258:b4c88c7daa4f user:Pierre-Yves David date:Thu Jan 14 06:52:36 2021 +0100 summary: tests: wider work around matching in test-narrow-shallow.t https://www.mercurial-scm.org/repo/hg/rev/4e85439c1760 changeset: 46259:4e85439c1760 user:Augie Fackler date:Fri Jan 15 12:52:52 2021 -0500 summary: fuzz: fix Makefile default PYTHON_CONFIG_FLAGS to be modern https://www.mercurial-scm.org/repo/hg/rev/abba2d365373 changeset: 46260:abba2d365373 user:Augie Fackler date:Fri Jan 15 12:56:25 2021 -0500 summary: revlog: migrate from PyEval_CallObject to PyObject_Call https://www.mercurial-scm.org/repo/hg/rev/c9b2a4d69e66 changeset: 46261:c9b2a4d69e66 user:Martin von Zweigbergk date:Wed Jan 13 22:37:21 2021 -0800 summary: errors: raise InputError when non-existent help section requested https://www.mercurial-scm.org/repo/hg/rev/9c9e0b4b2ca7 changeset: 46262:9c9e0b4b2ca7 user:Martin von Zweigbergk date:Thu Jan 14 11:53:55 2021 -0800 summary: error: use detailed exit code 10 for
[Bug 6469] New: gendoc error while building 5.7rc0
https://bz.mercurial-scm.org/show_bug.cgi?id=6469 Bug ID: 6469 Summary: gendoc error while building 5.7rc0 Product: Mercurial Version: stable branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org Python Version: --- signing 46335:d9d97a6ef284 hgrc.5.gendoc.txt:1953: (ERROR/3) Unexpected indentation. Exiting due to level-3 (ERROR) system message. make[1]: *** [hgrc.5] Error 1 make: *** [doc] Error 2 make -C doc make[1]: Entering directory '/home/pulkit/repo/release-repo/release-build-5.7rc0/doc' python runrst hgmanpage --halt warning \ --strip-elements-with-class htmlonly hgrc.5.txt hgrc.5 hgrc.5.gendoc.txt:1953: (ERROR/3) Unexpected indentation. Exiting due to level-3 (ERROR) system message. Makefile:26: recipe for target 'hgrc.5' failed make[1]: *** [hgrc.5] Error 1 make[1]: Leaving directory '/home/pulkit/repo/release-repo/release-build-5.7rc0/doc' Makefile:75: recipe for target 'doc' failed make: *** [doc] Error 2 tar (child): dist/mercurial-5.7rc0.tar.gz: Cannot open: No such file or directory tar (child): Error is not recoverable: exiting now tar: Child returned status 2 tar: Error is not recoverable: exiting now ../release-scripts/make-release: line 32: cd: mercurial-5.7rc0: No such file or directory Mercurial Distributed SCM (version 5.7rc0) cp: cannot stat 'dist/mercurial-5.7rc0.tar.gz': No such file or directory -- You are receiving this mail because: You are on the CC list for the bug. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@46241: 2 new changesets
2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/a42502e9ae6d changeset: 46240:a42502e9ae6d user:Joerg Sonnenberger date:Mon Dec 28 01:05:09 2020 +0100 summary: worker: POSIX only supports workers from main thread (issue6460) https://www.mercurial-scm.org/repo/hg/rev/012e25abc603 changeset: 46241:012e25abc603 bookmark:@ tag: tip user:Pierre-Yves David date:Fri Nov 20 08:02:25 2020 +0100 summary: command: automatically create alias for command using '-' in names -- 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
