[Bug 6101] New: Add support for "pick something outside the chain" to curses histedit
https://bz.mercurial-scm.org/show_bug.cgi?id=6101 Bug ID: 6101 Summary: Add support for "pick something outside the chain" to curses histedit Product: Mercurial Version: stable branch Hardware: All OS: All Status: UNCONFIRMED Severity: feature Priority: wish Component: histedit Assignee: bugzi...@mercurial-scm.org Reporter: duri...@gmail.com CC: mercurial-devel@mercurial-scm.org From internal report: > In text histedit, I can pick whatever I want. Curses histedit constrains me to > what's already in the ancestor chain. I use out-of-chain picks to rebase > orphan > commits in a different order without having to run the rebases individually. Seems reasonable. Probably not hard, in case someone is looking to spruce up curses-histedit for not much effort... -- 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
[Bug 6100] New: Building and running tests in local mode with Python 3 doesn't works
https://bz.mercurial-scm.org/show_bug.cgi?id=6100
Bug ID: 6100
Summary: Building and running tests in local mode with Python 3
doesn't works
Product: Mercurial
Version: default branch
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: lothiral...@gmail.com
CC: mercurial-devel@mercurial-scm.org
I tried setup a Python 3 job on our Jenkins instance by mimicking the Python 2
job we had. The setup included having a separate build step that called
`PYTHON=python3 make local` and a separate test step that called `python3
run-tests.py -l -j 4 -t 1200`.
Here are the tests steps logs:
https://ci.octobus.net/blue/rest/organizations/jenkins/pipelines/MercurialPy3/runs/327/nodes/29/steps/35/log/?start=0
Here are the building step logs:
https://ci.octobus.net/blue/rest/organizations/jenkins/pipelines/MercurialPy3/runs/327/nodes/20/log/?start=0
This specific exception leads Pulkit to think that the demandimporter might mot
be working when building that way:
+ Traceback (most recent call last):
+File "check-seclevel.py", line 23, in
+ table = commands.table
+File "/usr/lib/python3.5/importlib/util.py", line 237, in
__getattribute__
+ self.__spec__.loader.exec_module(self)
+File "", line 673, in
exec_module
+File "", line 222, in
_call_with_frames_removed
+File "../mercurial/commands.py", line 74, in
+ table.update(debugcommandsmod.command._table)
+File "/usr/lib/python3.5/importlib/util.py", line 237, in
__getattribute__
+ self.__spec__.loader.exec_module(self)
+File "", line 673, in
exec_module
+File "", line 222, in
_call_with_frames_removed
+File "../mercurial/debugcommands.py", line 552, in
+ @command('debugdata', cmdutil.debugrevlogopts, _('-c|-m|FILE REV'))
+File "/usr/lib/python3.5/importlib/util.py", line 237, in
__getattribute__
+ self.__spec__.loader.exec_module(self)
+File "", line 673, in
exec_module
+File "", line 222, in
_call_with_frames_removed
+File "../mercurial/cmdutil.py", line 56, in
+ stringio = util.stringio
+File "/usr/lib/python3.5/importlib/util.py", line 237, in
__getattribute__
+ self.__spec__.loader.exec_module(self)
+File "", line 673, in
exec_module
+File "", line 222, in
_call_with_frames_removed
+File "../mercurial/util.py", line 3916, in
+ i18nfunctions = bundlecompressiontopics().values()
+File "../mercurial/util.py", line 3898, in bundlecompressiontopics
+ if not engine.available():
+File "../mercurial/util.py", line 3775, in available
+ return bool(self._module)
+File "../mercurial/util.py", line 1559, in __get__
+ result = self.func(obj)
+File "../mercurial/util.py", line 3769, in _module
+ zstd.__version__
+File "/usr/lib/python3.5/importlib/util.py", line 248, in
__getattribute__
+ return getattr(self, attr)
+ AttributeError: module 'mercurial.zstd' has no attribute '__version__'
Removing the separate build step and letting `run-tests.py` build Mercurial
seems to have fixed this specific error.
--
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
[Bug 6099] New: 'ZeroDivisionError' with experimental features
https://bz.mercurial-scm.org/show_bug.cgi?id=6099 Bug ID: 6099 Summary: 'ZeroDivisionError' with experimental features Product: Mercurial Version: stable branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: damien...@gmx.fr CC: mercurial-devel@mercurial-scm.org $ bash < hgrc [ui] tweakdefaults=true [experimental] extendedheader.similarity=true HGRC test -d hg-all || hg clone https://www.mercurial-scm.org/repo/hg-all hg -R hg-all log -pr 9da97f49d4f4 SH ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.15 (default, Jan 10 2019, 23:20:52) [GCC 8.2.1 20181127] ** Mercurial version 4.9, système de gestion de sources distribué ** Extensions chargées : Traceback (most recent call last): File "/usr/bin/hg", line 43, in dispatch.run() File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 99, in run status = dispatch(req) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 225, in dispatch ret = _runcatch(req) or 0 File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 376, in _runcatch return _callcatch(ui, _runcatchfunc) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 384, in _callcatch return scmutil.callcatch(ui, func) File "/usr/lib/python2.7/site-packages/mercurial/scmutil.py", line 165, in callcatch return func() File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 367, in _runcatchfunc return _dispatch(req) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 1021, in _dispatch cmdpats, cmdoptions) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 756, in runcommand ret = _runcommand(ui, options, cmd, d) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 1030, in _runcommand return cmdfunc() File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 1018, in d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1670, in check return func(*args, **kwargs) File "/usr/lib/python2.7/site-packages/mercurial/commands.py", line 3884, in log displayfn(ui, repo, revs, displayer, getrenamed) File "/usr/lib/python2.7/site-packages/mercurial/logcmdutil.py", line 899, in displayrevs displayer.show(ctx, copies=copies) File "/usr/lib/python2.7/site-packages/mercurial/logcmdutil.py", line 189, in show self._show(ctx, copies, props) File "/usr/lib/python2.7/site-packages/mercurial/logcmdutil.py", line 290, in _show self._showpatch(ctx, graphwidth) File "/usr/lib/python2.7/site-packages/mercurial/logcmdutil.py", line 317, in _showpatch graphwidth, stat=False) File "/usr/lib/python2.7/site-packages/mercurial/logcmdutil.py", line 140, in showdiff hunksfilterfn=self._makehunksfilter(ctx)) File "/usr/lib/python2.7/site-packages/mercurial/logcmdutil.py", line 89, in diffordiffstat for chunk in util.filechunkiter(util.chunkbuffer(chunks)): File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 2412, in filechunkiter s = nbytes and f.read(nbytes) File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 2353, in read for chunk in self.iter: File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 2325, in splitbig for chunk in chunks: File "/usr/lib/python2.7/site-packages/mercurial/patch.py", line 2272, in diff losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy, File "/usr/lib/python2.7/site-packages/mercurial/patch.py", line 2704, in trydiff sim = similar.score(ctx1[path1], ctx2[path2]) * 100 File "/usr/lib/python2.7/site-packages/mercurial/similar.py", line 69, in score return _score(fctx1, _ctxdata(fctx2)) File "/usr/lib/python2.7/site-packages/mercurial/similar.py", line 66, in _score return equal * 2.0 / lengths ZeroDivisionError: float division by zero -- 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
[Bug 6098] New: evolve of merge with pruned parents results in merge with both parents same
https://bz.mercurial-scm.org/show_bug.cgi?id=6098 Bug ID: 6098 Summary: evolve of merge with pruned parents results in merge with both parents same Product: Mercurial Version: 4.7.2 Hardware: PC OS: Mac OS Status: UNCONFIRMED Severity: bug Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: martinv...@google.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org This test case (applied to f109917f) shows the problem: diff --git a/tests/test-evolve-orphan-merge.t b/tests/test-evolve-orphan-merge.t --- a/tests/test-evolve-orphan-merge.t +++ b/tests/test-evolve-orphan-merge.t @@ -537,6 +537,8 @@ point where the other parent of merge is | () draft o 0:8fa14d15e168 added hgignore () draft + $ hg debugindex -c | tail -n 1 + 29 29 b61ba77b924a 8fa14d15e168 8fa14d15e168 7) When one parent is pruned without successor and has no parent -- 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
[Bug 6097] New: "ProgrammingError: tried to relocate a node on top of itself" from evolve
https://bz.mercurial-scm.org/show_bug.cgi?id=6097
Bug ID: 6097
Summary: "ProgrammingError: tried to relocate a node on top of
itself" from evolve
Product: Mercurial
Version: 4.8
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: martinv...@google.com
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
This patch (applied to 8b910889) shows the bug:
diff --git a/tests/test-evolve-order.t b/tests/test-evolve-order.t
--- a/tests/test-evolve-order.t
+++ b/tests/test-evolve-order.t
@@ -16,6 +16,7 @@ evolve --rev reordering
> [ui]
> logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n
> [extensions]
+ > rebase =
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
$ mkcommit() {
@@ -259,3 +260,14 @@ Test multiple revision with some un-evol
skipping 0b9488394e89: divergent rewriting. can't choose destination
working directory is now at 31809a198477
+
+ $ hg log -G -r 34::
+ $ hg co 34
+ $ echo stuff > new-file
+ $ hg commit --amend -Aqm 'b3second and new stuff'
+ $ hg rebase -r . -d 35
+ $ hg obslog
+ $ hg prune 35
+ $ hg log -G -r 33:
+ $ hg co 34
+ $ hg evolve -aA
--
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
[Bug 6096] New: Clone with subrepo path now considered illegal in version4.9
https://bz.mercurial-scm.org/show_bug.cgi?id=6096 Bug ID: 6096 Summary: Clone with subrepo path now considered illegal in version4.9 Product: Mercurial Version: 4.9 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: richard.ge...@yahoo.de CC: mercurial-devel@mercurial-scm.org Cloning our existing repository with the latest version of mercurial (4.9) fails: subrepo path contains illegal compontent: clickpoints/includes/qextendedgraphicsview I have seen that there was a change to prevent absolute paths in subrepositories to prevent mercurial from being tricked to write outside the repository path, but our path is a relative path, so it should not be considered illegal. Here is the content of our .hgsub file: clickpoints/includes/qextendedgraphicsview = qextendedgraphicsview [subpaths] https://bitbucket\.org/fabry_biophysics/clickpoints/qextendedgraphicsview = https://bitbucket.org/fabry_biophysics/qextendedgraphicsview https://(.*@)bitbucket\.org/fabry_biophysics/clickpoints/qextendedgraphicsview = https://\1bitbucket.org/fabry_biophysics/qextendedgraphicsview ssh://(.*@)bitbucket\.org/fabry_biophysics/clickpoints/qextendedgraphicsview = ssh://\1bitbucket.org/fabry_biophysics/qextendedgraphicsview -- 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
[Bug 6095] New: `hg amend` on windows can lead to a broken repository
https://bz.mercurial-scm.org/show_bug.cgi?id=6095 Bug ID: 6095 Summary: `hg amend` on windows can lead to a broken repository Product: Mercurial Version: stable branch Hardware: PC OS: Windows Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org I just ran `hg amend` on windows and it resulted in following output: ``` D:\Files\pulkit\something>hg amend --config extensions.amend= warning: Watchman unavailable: "watchman" executable not in PATH ([Error 2] The system cannot find the file specified) saved backup bundle to D:\Files\pulkit\something\.hg\strip-backup/2f6c61f2fcd3-0ff913ce-amend.hg transaction abort! failed to truncate 00changelog.i rollback failed - please run hg recover (failure reason: [Errno 13] Permission denied) strip failed, backup bundle stored in 'D:\Files\pulkit\something\.hg\strip-backup/2f6c61f2fcd3-0ff913ce-amend.hg' strip failed, unrecovered changes stored in 'D:\Files\pulkit\something\.hg\strip-backup/2f6c61f2fcd3-a8a80da8-temp.hg' (fix the problem, then recover the changesets with "hg unbundle 'D:\Files\pulkit\something\.hg\strip-backup/2f6c61f2fcd3-a8a80da8-temp.hg'") abort: Permission denied ``` There are two things which I think are worth improving here: 1) better support for rollbacking a transaction, there is something wrong in amend code 2) fix this issue The amend which I used was the amend extension present in core. There might be issues with opening an editor and that can lead to Permission denied. Although, the amend extension in core does not opens an editor IIUC. -- 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
[Bug 6094] New: `hg incoming` incorrectly reports that csets that are obsolete but present both locally and remotely will be pulled in from remote
https://bz.mercurial-scm.org/show_bug.cgi?id=6094 Bug ID: 6094 Summary: `hg incoming` incorrectly reports that csets that are obsolete but present both locally and remotely will be pulled in from remote Product: Mercurial Version: 4.9 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: fah...@faheem.info CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org I have a local repository, which I'm pushing to a remote non-publishing repository. I just noticed that a `hg incoming` gives a list of csets, even though local and remote should be synced, and therefore `hg incoming` should be empty. However, `hg incoming --hidden` is indeed empty. The list of csets appears to be present but obsolete on both local and remote. Some, but not all of them, are pruned csets. And this is a small subset of the total number of obsolete csets present on local and remote. I also see that the number of heads reported locally is 2, while the number of heads reported remotely is 3. The difference is a cset that remote says is obsolete, but `hg heads` still shows it, and it looks like this. @ changeset: 1562:7b12947817ab Shouldn't it have an x, since it's obsolete? I did a local clone of the remote, and obsolete csets still show up in there. More information available on request. But bear in mind this is a live repository, so the bug symptoms might disappear at any moment. https://bz.mercurial-scm.org/show_bug.cgi?id=4202 is a similar, related bug. -- 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
[Bug 6093] New: pick can great bogus marker to the pick "destination"
https://bz.mercurial-scm.org/show_bug.cgi?id=6093 Bug ID: 6093 Summary: pick can great bogus marker to the pick "destination" Product: Mercurial Version: unspecified Hardware: PC OS: Mac OS Status: UNCONFIRMED Severity: feature Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: jorendo...@mozilla.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org Let's call this changeset ORIGINAL: ``` $ hg log --graph --hidden -r 0262c62d81e5 x changeset: 528466:0262c62d81e5 ~ parent: 528452:47e514e01c5c user:Jason Orendorff date:Thu Feb 21 09:51:45 2019 -0600 obsolete:rewritten using prune as 528566:e7fd0ec90ddf obsolete:rewritten using pick as 528814:b3cce8cc8cf8 summary: Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia ``` And this one DESTINATION: ``` $ hg log --graph -r b3cce8cc8cf8 * changeset: 528814:b3cce8cc8cf8 ~ user:Jason Orendorff date:Fri Feb 15 14:01:15 2019 -0600 instability: content-divergent summary: Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia ``` These patches are unrelated: DESTINATION should *not* be marked as the successor of ORIGINAL. That's the bug. Here's what happened: - I tried to rebase ORIGINAL onto DESTINATION using `pick -r 0262c62d81e5`. There were conflicts. - I fixed the conflicts manually, then did `resolve -m` and `pick -c`. - After resolving, there were no changes, so `pick -c` did not create a rebased changeset. - A few minutes later, I realized that (of course) someone else had already rebased and landed ORIGINAL, and a bunch of other related patches, without obsmarkers. My local hg didn't know that the changeset I just picked had already been rebased and was obsolete. - So I marked the whole range of ORIGINAL patches as having landed, using `prune -r ORIGINAL_RANGE --succ LANDED_RANGE --biject`. The comedy of errors is my fault; the only bug in hg is that `pick` erroneously marked DESTINATION as the successor of ORIGINAL. marmoute helped me sort through the wreckage on IRC. -- 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
[Bug 6092] New: Information of current selected commit is not proper
https://bz.mercurial-scm.org/show_bug.cgi?id=6092 Bug ID: 6092 Summary: Information of current selected commit is not proper Product: Mercurial Version: 4.9 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: histedit Assignee: bugzi...@mercurial-scm.org Reporter: akshjain.jai...@gmail.com CC: mercurial-devel@mercurial-scm.org In histedit curses interface, Selecting a changeset with the space bar highlights the current line.But on render commit window information about current selected changeset is not proper, It always show the information about the first changeset that we did (#0) proper information about the current selected changeset need to be displayed -- 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
[Bug 6089] New: `hg pick` doesn’t update branch of working directory
https://bz.mercurial-scm.org/show_bug.cgi?id=6089
Bug ID: 6089
Summary: `hg pick` doesn’t update branch of working directory
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: m...@manueljacob.de
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
Steps to reproduce:
hg init
touch test1
hg add test1
hg ci -m 'first commit on default'
hg branch foo
touch test2
hg add test2
hg ci -m 'first commit on foo'
hg up default
echo test > test1
hg ci -m 'second commit on default'
hg grab 1
hg log --template '{branch}\n' -r tip
hg branch
Expected behavior:
The branch of the working directory is `foo`, the same as the branch of the new
changeset. This would be consistent with the description of the command in the
help: "move a commit on the top of working directory parent and updates to it".
Actual behavior:
The branch of the working directory is `default`.
Analysis:
The implementation of the `hg pick` command, function `cmdpick` in
`hgext3rd/evolve/cmdrewrite.py`, passes the `extra` dictionary of the original
changeset to `repo.commit()`. However, it doesn’t update the branch of the
working 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
[Bug 6088] New: make `hg debugupgraderepo` to work on repos using zstd compression
https://bz.mercurial-scm.org/show_bug.cgi?id=6088 Bug ID: 6088 Summary: make `hg debugupgraderepo` to work on repos using zstd compression Product: Mercurial Version: 4.8 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org `hg debugupgraderepo` refuses to work on repositories which uses zstd compression. -- 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
[Bug 6087] New: make `hg debugupgraderepo` to work on treemanifest repo
https://bz.mercurial-scm.org/show_bug.cgi?id=6087 Bug ID: 6087 Summary: make `hg debugupgraderepo` to work on treemanifest repo Product: Mercurial Version: 4.8 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org `hg debugupgraderepo` is a nice tool to upgrade your repository with the new optimizations done in recent mercurial. However it does not work on repos which uses treemanifest. -- 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
[Bug 6086] New: In-memory rebase still calls update hooks, but not preupdate hooks
https://bz.mercurial-scm.org/show_bug.cgi?id=6086 Bug ID: 6086 Summary: In-memory rebase still calls update hooks, but not preupdate hooks Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: rebase Assignee: bugzi...@mercurial-scm.org Reporter: h...@pewpew.net CC: mercurial-devel@mercurial-scm.org Here's a .t file showing the issue; the in-memory rebase runs update hooks (not sure why), but doesn't run preupdate hooks. It should probably run both or neither? $ cat > preupdate.sh < #!/bin/bash > echo preupdate >> $TESTTMP/update_hooks.txt > EOF $ cat > update.sh < #!/bin/bash > echo update >> $TESTTMP/update_hooks.txt > EOF $ chmod +x preupdate.sh update.sh $ cat >> $HGRCPATH < [experimental] > evolution.createmarkers=True > evolution.allowunstable=True > [extensions] > rebase= > [hooks] > preupdate.does_it_work=$TESTTMP/preupdate.sh > update.does_it_work=$TESTTMP/update.sh > EOF $ hg init a $ cd a $ echo r0 > file.txt $ hg ci -qAm 'r0' $ echo r1 > file.txt $ hg ci -qAm 'r1' $ echo r2 > file.txt $ hg ci -qAm 'r2' $ hg co -qr 0 no inmemory rebase: $ hg commit -q --amend -m 'r0_amended' 're:^$' 2 new orphan changesets $ rm $TESTTMP/update_hooks.txt $ hg rebase -qr 1::2 -d . $ cat $TESTTMP/update_hooks.txt preupdate update preupdate update preupdate update with inmemory rebase: $ hg commit -q --amend -m 'r0_amended_again' 're:^$' 2 new orphan changesets $ rm $TESTTMP/update_hooks.txt $ hg --config rebase.experimental.inmemory=1 rebase -qr 4::5 -d . $ cat $TESTTMP/update_hooks.txt update update -- 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
[Bug 6085] New: Exception AttributeError presumably from largefiles
https://bz.mercurial-scm.org/show_bug.cgi?id=6085 Bug ID: 6085 Summary: Exception AttributeError presumably from largefiles Product: Mercurial Version: 4.9 Hardware: Macintosh OS: Mac OS Status: UNCONFIRMED Severity: bug Priority: wish Component: largefiles Assignee: bugzi...@mercurial-scm.org Reporter: peter.vi...@uni-siegen.de CC: mercurial-devel@mercurial-scm.org, nato...@gmail.com Since several days I get this error message: Exception AttributeError: "'NoneType' object has no attribute 'close'" in > ignored The message is only shown when doing a hg operation that reaches for a remote repository, e.g. `push` or `pull` or `out`, but not `update`. The first time I saw this was with 4.7.2, but it also occurs with 4.9. I'm a little helpless here. I tried to dig a little into largefiles extension to get an idea of what could cause this error, but it seems this problem to require a deeper understanding of mercurial's internals and/or python than I can provide. -- 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
[Bug 6084] New: `hg merge` can loose file renames
https://bz.mercurial-scm.org/show_bug.cgi?id=6084 Bug ID: 6084 Summary: `hg merge` can loose file renames Product: Mercurial Version: 4.8 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org I can reproduce this by the following steps: ``` $ hg init temprepo $ cd temprepo/ $ echo a > a $ hg ci -Aqm 'added a' $ echo b > b $ hg ci -Aqm 'added b' $ echo c > c $ hg ci -Aqm 'added c' $ hg prev 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [1] added b $ hg mv b d $ hg diff diff --git a/b b/d rename from b rename to d $ hg ci -m "moved b to d" created new head (consider using topic for lightweight branches. See 'hg help topic') $ hg work @ 799c moved b to d | o 62bd added c |/ o a1fc added b o a5ea added a $ hg up 62bd 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg work o 799c moved b to d | @ 62bd added c |/ o a1fc added b o a5ea added a $ hg merge 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg diff diff --git a/b b/b deleted file mode 100644 --- a/b +++ /dev/null @@ -1,1 +0,0 @@ -b diff --git a/d b/d new file mode 100644 --- /dev/null +++ b/d @@ -0,0 +1,1 @@ +b pulkit@pulkit-nix:~/repo/temprepo$ hg status M d R b # The repository is in an unfinished *merge* state. # To continue:hg commit # To abort: hg merge --abort $ hg config experimental.copytrace $ ``` As it can be seen, file rename is lost after merging. This is a quite important issue because when using merges, we merge a user branch into default and the moves in user branch does not come to default branch. -- 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
[Bug 6083] New: `debugwaitonrepack` can returns too early
https://bz.mercurial-scm.org/show_bug.cgi?id=6083 Bug ID: 6083 Summary: `debugwaitonrepack` can returns too early Product: Mercurial Version: 4.9rc0 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: lothiral...@gmail.com CC: mercurial-devel@mercurial-scm.org While trying to stabilize output of the `test-remotefilelog-bgprefetch.t` test (https://phab.mercurial-scm.org/D5960), we detected that `debugwaitonrepack` is buggy. Here is how I reproduced it: python run-tests.py --runs-per-test=100 test-remotefilelog-bgprefetch.t I cannot reproduce the issue 100% of the time and it seems more flaky with a busy workstation. -- 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
[Bug 6082] New: Support ! pattern negation in .hgignore as for Git
https://bz.mercurial-scm.org/show_bug.cgi?id=6082
Bug ID: 6082
Summary: Support ! pattern negation in .hgignore as for Git
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: pierre.aug...@univ-grenoble-alpes.fr
CC: mercurial-devel@mercurial-scm.org
It's difficult to work with hg-git for some Git repositories (example
https://github.com/pyenv) because they use in their .gitignore the ! pattern.
From the Git documentation:
"An optional prefix "!" which negates the pattern; any matching file excluded
by a previous pattern will become included again. It is not possible to
re-include a file if a parent directory of that file is excluded. Git doesn’t
list excluded directories for performance reasons, so any patterns on contained
files have no effect, no matter where they are defined. "
For a repository using such pattern, one gets: `.gitignore: unsupported ignore
pattern '!/.gitignore'`
There is an issue in the hg-git repository on Bitbucket
(https://bitbucket.org/durin42/hg-git/issues/190/add-support-for-gitignore-pattern-negation),
but it seems that it should be solved at the Mercurial level.
Note that Git does something reasonable in terms of performance ("It is not
possible to re-include a file if a parent directory of that file is excluded.
Git doesn’t list excluded directories for performance reasons, so any patterns
on contained files have no effect, no matter where they are defined.") so
Mercurial could do the same?
--
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
[Bug 6081] New: Improve message "waiting for lock ..." ?
https://bz.mercurial-scm.org/show_bug.cgi?id=6081 Bug ID: 6081 Summary: Improve message "waiting for lock ..." ? Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: pierre.aug...@univ-grenoble-alpes.fr CC: mercurial-devel@mercurial-scm.org Some students were confused by the message "waiting for lock on working directory of /home/me/tmp/tmp_repo held by process '6631' on host 'gre/effc'" See https://bz.mercurial-scm.org/show_bug.cgi?id=4752 I was told that Git prints a clearer explanation: " $ git commit -a fatal: Unable to create '/tmp/git/.git/index.lock': File exists. Another git process seems to be running in this repository, e.g. an editor opened by 'git commit'. Please make sure all processes are terminated then try again. If it still fails, a git process may have crashed in this repository earlier: remove the file manually to continue. " Wouldn't it be good to print something as clear/explicit as Git? -- 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
[Bug 6080] New: Unclear warning message when pushing a closed branch
https://bz.mercurial-scm.org/show_bug.cgi?id=6080 Bug ID: 6080 Summary: Unclear warning message when pushing a closed branch Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: pierre.aug...@univ-grenoble-alpes.fr CC: mercurial-devel@mercurial-scm.org A developer of a project using Mercurial was confused by a warning that he did not understood. He was trying to push on his own repository after a pull from the main repository of the project and he got: ``` hg push ../tmp_repo pushing to ../tmp_repo searching for changes abort: push creates new remote branches: dev! (use 'hg push --new-branch' to create new remote branches) ``` The branch dev was closed and he didn't know that this branch exists since he pulled the branch already closed from the main repository. So he obtained something like: ``` hg branches default3:2c8ac9499cf1 ``` and `hg heads` also showed one head. Wouldn't be good to provide a better message in this case? At least to mention that the branch is closed with something like "abort: push creates new remote branches: dev (closed)!" -- 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
[Bug 6079] New: histedit uses curses by default (against doc)
https://bz.mercurial-scm.org/show_bug.cgi?id=6079 Bug ID: 6079 Summary: histedit uses curses by default (against doc) Product: Mercurial Version: 4.9 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: feature Priority: wish Component: histedit Assignee: bugzi...@mercurial-scm.org Reporter: from...@squelart.com CC: mercurial-devel@mercurial-scm.org After encountering the issue reported in bug 6078, I installed windows-curses, and then saw that indeed histedit now wants to use curses. I personally preferred the old way, using the editor I'd chosen in $EDITOR. But I guess it's a good way to make people notice! :-) Now, reading the release notes: "'hg histedit' will now present a curses UI if curses is available and 'ui.interface' or 'ui.interface.histedit' is set to 'curses'." I had not set any of these, but was still presented with curses. Setting 'ui.interface.histedit' to "text" (which `hg help config` says should be the default) reverted to using my preferred $EDITOR, but that was not obvious to find out! So I think the default should stay "text" as before. Otherwise the documentation should be updated to reflect the new default, and more helpfully describe how to change it back. -- 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
[Bug 6078] New: histedit fails with "abort: No module named _curses!"
https://bz.mercurial-scm.org/show_bug.cgi?id=6078 Bug ID: 6078 Summary: histedit fails with "abort: No module named _curses!" Product: Mercurial Version: 4.9 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Priority: wish Component: histedit Assignee: bugzi...@mercurial-scm.org Reporter: br...@vandyk.net.nz CC: mercurial-devel@mercurial-scm.org The histedit command is failing since I bumped to hg 4.9. If I downgrade to mercurial 4.8.2 the command runs without issue. STR: - run command `hg histedit`. - fails with "abort: No module named _curses!", no other output is produced. Further information: - Windows 10. - Running within a Mozilla Build env (https://wiki.mozilla.org/MozillaBuild). -- 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
[Bug 6077] New: Traceback in hg fix: TypeError: argument of type 'NoneType' is not iterable
https://bz.mercurial-scm.org/show_bug.cgi?id=6077
Bug ID: 6077
Summary: Traceback in hg fix: TypeError: argument of type
'NoneType' is not iterable
Product: Mercurial
Version: 4.9
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: z...@zash.se
CC: mercurial-devel@mercurial-scm.org
hg config:
```
[extensions]
fix =
[fix]
trailing-whitespace:command = sed
trailing-whitespace:linerange = -e '{first},{last}s/\s\+$//'
```
Steps to reproduce:
```
$ hg init
$ echo hello > test
$ hg add test
$ hg fix -w
```
Full traceback:
```
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/mercurial/worker.py", line 191, in
_posixworker
ret = scmutil.callcatch(ui, workerfunc)
File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 165, in
callcatch
return func()
File "/usr/lib/python2.7/dist-packages/mercurial/worker.py", line 187, in
workerfunc
for result in func(*(staticargs + (pargs,))):
File "/usr/lib/python2.7/dist-packages/hgext/fix.py", line 204, in getfixes
newdata = fixfile(ui, opts, fixers, ctx, path, basectxs[rev])
File "/usr/lib/python2.7/dist-packages/hgext/fix.py", line 498, in fixfile
if fixer.affects(opts, fixctx, path):
File "/usr/lib/python2.7/dist-packages/hgext/fix.py", line 672, in affects
return scmutil.match(fixctx, [self._pattern], opts)(path)
File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 790, in
match
return matchandpats(ctx, pats, opts, globbed, default, badfn=badfn)[0]
File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 781, in
matchandpats
default, listsubrepos=opts.get('subrepos'), badfn=badfn)
File "/usr/lib/python2.7/dist-packages/mercurial/context.py", line 1411, in
match
icasefs=icasefs)
File "/usr/lib/python2.7/dist-packages/mercurial/match.py", line 177, in
match
kindpats = normalize(patterns, default, root, cwd, auditor, warn)
File "/usr/lib/python2.7/dist-packages/mercurial/match.py", line 222, in
_donormalize
for kind, pat in [_patsplit(p, default) for p in patterns]:
File "/usr/lib/python2.7/dist-packages/mercurial/match.py", line 1029, in
_patsplit
if ':' in pattern:
TypeError: argument of type 'NoneType' is not iterable
```
--
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
[Bug 6076] New: Merge driver needs documentation
https://bz.mercurial-scm.org/show_bug.cgi?id=6076 Bug ID: 6076 Summary: Merge driver needs documentation Product: Mercurial Version: 4.8 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: martinv...@google.com CC: mercurial-devel@mercurial-scm.org There doesn't seem to be any documentation and no test cases to look at either, so it's hard to understand how to use it. -- 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
[Bug 6075] New: explicit GC on every request make repositories with thousands of largesfiles very slow to clone
https://bz.mercurial-scm.org/show_bug.cgi?id=6075 Bug ID: 6075 Summary: explicit GC on every request make repositories with thousands of largesfiles very slow to clone Product: Mercurial Version: 4.9 Hardware: All OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: hgweb Assignee: bugzi...@mercurial-scm.org Reporter: las...@unity3d.com CC: mercurial-devel@mercurial-scm.org Created attachment 2032 --> https://bz.mercurial-scm.org/attachment.cgi?id=2032=edit demo output of lfpull from two hgwebs in mercurial 4.5.3 this: finally: # There are known cycles in localrepository that prevent # those objects (and tons of held references) from being # collected through normal refcounting. We mitigate those # leaks by performing an explicit GC on every request. # TODO remove this once leaks are fixed. # TODO only run this on requests that create localrepository # instances instead of every request. gc.collect() === was added to "def run_wsgi(self, req, res):" in mercurial/hgweb/hgwebdir_mod.py and is still present in latest version. This is a problem for repositories with thousands of largesfile, as each largefile equals a request on initial clone. at Unity We e.g. have a repository with ~17000 largefiles, and albeit that is a pourly provisioned repostory, it takes ~15 minutes to clone from hwgeb running on mercurial 4.5.2, and 2-4 hours on mercurial 4.5.3 and later which doenst play well with our CI. I've made a docker image to debug this issue: https://github.com/lasse-aagren/hgweb-gc-debug-docker. If created as hgweb-demo:latest and run as: docker run --rm -it hgweb-demo:latest /hgweb/lfpull-test.sh it will spin up 2 hg serve instances, one on 4.5.2 and one on 4.5.3, on top a demorepo with 1000 4k largefiles. It will then clone 3 consecutive time from hgweb standalon on 4.5.2 and then 3 times from hgweb standalone on 4.5.3. Result is attached, but the important points is, all 3 lfpulls from 4.5.2 takes ~60secs each. With 4.5.3 the first lfpull of the 1000 files takes ~60sec, the next one takes ~120 secs and the third ~180 secs. And it just get worse from there. If I use mercurial 4.9 with the "gc.collect()" replaced by a "pass", it performs as with version 4.5.2 and before. Is my oberservations correct, and can something be done to mitigate it? Please dont hesitate to ask me for further information. Best regards, Lasse Aagren -- 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
[Bug 6074] New: ✨ :sparkles: Support for emojis in commit messages
https://bz.mercurial-scm.org/show_bug.cgi?id=6074 Bug ID: 6074 Summary: ✨ :sparkles: Support for emojis in commit messages Product: Mercurial Version: 4.8.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: hgweb Assignee: bugzi...@mercurial-scm.org Reporter: arthur.l...@logilab.fr CC: mercurial-devel@mercurial-scm.org emoji in commit messages should not be reserved to git ! mercurial can do them too ! and hgweb could display them too ! https://gitmoji.carloscuesta.me/ for reference ✨ -- 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
[Bug 6073] New: Select highlight stops following current location
https://bz.mercurial-scm.org/show_bug.cgi?id=6073 Bug ID: 6073 Summary: Select highlight stops following current location Product: Mercurial Version: 4.9 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: histedit Assignee: bugzi...@mercurial-scm.org Reporter: c.ozan...@gmail.com CC: mercurial-devel@mercurial-scm.org Selecting a changeset with the space bar highlights the current line. Moving the selected line up and down, the highlight follows. However if you moved it to the very top of the cursor screen, it get stuck there. It does show the change moving up / down but the highlight remains at the top. -- 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
[Bug 6072] New: histedit user information is not being shown correctly
https://bz.mercurial-scm.org/show_bug.cgi?id=6072 Bug ID: 6072 Summary: histedit user information is not being shown correctly Product: Mercurial Version: 4.9rc0 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: histedit Assignee: bugzi...@mercurial-scm.org Reporter: c.ozan...@gmail.com CC: mercurial-devel@mercurial-scm.org The new histedit curses interface shows information about each changeset as the cursor moves over each line. The user information is not being show correctly. For example, a full username is Craig Ozancin . User name is being deplayed as "c". -- 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
[Bug 6071] New: histedit curses interface is hard see selected line
https://bz.mercurial-scm.org/show_bug.cgi?id=6071 Bug ID: 6071 Summary: histedit curses interface is hard see selected line Product: Mercurial Version: 4.9rc0 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: histedit Assignee: bugzi...@mercurial-scm.org Reporter: c.ozan...@gmail.com CC: mercurial-devel@mercurial-scm.org With the new histedit curses interface, it is very difficult to see the current line. There is a very slight difference from other lines which makes it very difficult to see where we are at. On other curses interfaces (such as commit -i) the current line is shown as inverse magenta. Currently I am using to space (select) twice to see which line we are on. -- 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
[Bug 6070] New: ui.prompt() prompt disappears on window resize
https://bz.mercurial-scm.org/show_bug.cgi?id=6070 Bug ID: 6070 Summary: ui.prompt() prompt disappears on window resize Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: h...@pewpew.net CC: mercurial-devel@mercurial-scm.org I can't really write a test for this, but it's easy enough to reproduce: $ hg debuguiprompt -p 'are kittens cute?' This will ask you whether kittens are cute. Despite knowing the obvious correct answer, *don't* answer it, and instead resize your terminal. On Linux, at least (no idea on windows), we use readline by default, which replaces the prompt we wrote with the prompt we told readline about (which is a single space: ' '). Since almost all uses of `ui._prompt` are via `ui.promptchoice` (only one non-debugcommand use of `ui.prompt` in `mercurial/*.py`), and I suspect it doesn't make sense to use readline there, I'm going to send a change to stop using readline for ui.promptchoice prompts. I'm tempted to remove it entirely, but that feels like a bigger change. -- 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
[Bug 6069] New: histedit "abort: Access is denied" leaves temp changesets after --abort
https://bz.mercurial-scm.org/show_bug.cgi?id=6069 Bug ID: 6069 Summary: histedit "abort: Access is denied" leaves temp changesets after --abort Product: Mercurial Version: 4.8 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Priority: wish Component: histedit Assignee: bugzi...@mercurial-scm.org Reporter: pe...@lucid.ch CC: mercurial-devel@mercurial-scm.org I ran into this problem: % hg histedit abort: Access is denied: 'C:\Repo\folder' That itself is fine. 'C:\Repo\folder' was created in one of the edited changesets. But the directory was also the CWD of a cmd.exe process, denying access for Mercurial's attempt to remove / recreate the directory. I simply make sure this is not the case anymore by changing CWD or closing that cmd.exe process. But now I'm in a weird state. histedit has already created some "temp" changesets. I thought I should run 0hg histedit --abort' to undo the partial histedit: % hg histedit --abort But nothing happened. The "temp" changesets are still there. Trying it again: % hg histedit --abort abort: no histedit in progress OK, so I remove the "temp" changesets myself: % hg prune --rev=22972 1 changesets pruned Now I try the initial command again (now that access should not be denied): % hg histedit filtered revision '22783477979996c80051fa30e338486aea47e8b3' Nothing happened. 22783477979996c80051fa30e338486aea47e8b3 is the pruned revision 22972. % hg histedit --abort % hg --hidden strip 22972 ... % hg histedit This finally did the trick. I'm not sure if there's a bug here or if this is all working as intended, but it seems to me that ideally histedit would somehow do something more friendly. Thanks ⛄ -- 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
[Bug 6068] New: Merge conflict when doing `hg shelve --interactive`
https://bz.mercurial-scm.org/show_bug.cgi?id=6068 Bug ID: 6068 Summary: Merge conflict when doing `hg shelve --interactive` Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: shelve Assignee: bugzi...@mercurial-scm.org Reporter: h...@pewpew.net CC: mercurial-devel@mercurial-scm.org $ hg init $ cat > foo < r0 line 1 > r0 line 2 > r0 line -2 > r0 line -1 > EOF $ hg ci -qAm r0 $ cat > foo < r0 line 1 > r0 line 2 > dont shelve this 1 > dont shelve this 2 > shelve this 1 > shelve this 2 > r0 line -2 > r0 line -1 > EOF Now, try running `hg shelve -i` and (curses interface): unmark the "dont shelve this" lines (text interface): inspect the file, 'e' to edit, remove the "+dont shelve this" lines You'll get a merge conflict: $ cat foo r0 line 1 r0 line 2 <<< working copy: 6471987d4ca5 - shelve: changes to: r0 dont shelve this 1 dont shelve this 2 shelve this 1 shelve this 2 ||| base shelve this 1 shelve this 2 === >>> destination: ff8755499cc3 - spectral: r0 r0 line -2 r0 line -1 -- 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
[Bug 6067] New: zsh tab completions for `hg resolve -m` don't work in a subdir
https://bz.mercurial-scm.org/show_bug.cgi?id=6067 Bug ID: 6067 Summary: zsh tab completions for `hg resolve -m` don't work in a subdir Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: h...@pewpew.net CC: mercurial-devel@mercurial-scm.org $ hg init test_resolve $ cd test_resolve $ mkdir -p a/b/c $ echo hi > a/b/c/foo $ hg ci -qAm initial $ echo r1 >> a/b/c/foo $ hg ci -qm r1 $ hg co .^ $ echo r2 >> a/b/c/foo $ hg ci -qm r2 $ hg merge --tool internal:merge3 merging a/b/c/foo warning: conflicts while merging a/b/c/foo! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon $ hg resolve --list U a/b/c/foo `hg resolve -m a/` completes to 'a/b' like it should However, if I do `cd a`, and then `hg resolve -m b/`, nothing. Internally, we call `hg resolve -l ./b` in that situation, get back the path 'a/b/c/foo' (the paths in `hg resolve --list` are NOT relative; though I think martinvonz is going to make a config option for that, it won't matter here: we can't rely on it and we're setting HGPLAIN which will disable it), and add that to the list of unresolved_files. Something later that I haven't figured out what is for some reason ignoring that entry in unresolved_files, I guess because it doesn't start with 'b' like $PREFIX does? -- 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
[Bug 6066] New: rebase can lead to AttributeError
https://bz.mercurial-scm.org/show_bug.cgi?id=6066 Bug ID: 6066 Summary: rebase can lead to AttributeError Product: Mercurial Version: 4.9rc0 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: rebase Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org I was rebasing something and hit the following traceback: ``` ~/repo/pushaccess/tests$ hg rebase -b . -d @ rebasing 41680:62b328f80ba3 "py3: fix up test-remotefilelog-cacheprocess.t to not depend on a repr" Traceback (most recent call last): File "/usr/local/lib/python2.7/dist-packages/mercurial/scmutil.py", line 165, in callcatch return func() File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 367, in _runcatchfunc return _dispatch(req) File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 1021, in _dispatch cmdpats, cmdoptions) File "/usr/local/lib/python2.7/dist-packages/hgext/journal.py", line 90, in runcommand return orig(lui, repo, cmd, fullargs, *args) File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 756, in runcommand ret = _runcommand(ui, options, cmd, d) File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 1030, in _runcommand return cmdfunc() File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 1018, in d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1676, in check return func(*args, **kwargs) File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1676, in check return func(*args, **kwargs) File "/home/foobar/repo/mutable-history/hgext3rd/evolve/__init__.py", line 797, in warnobserrors return orig(ui, repo, *args, **kwargs) File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1676, in check return func(*args, **kwargs) File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1676, in check return func(*args, **kwargs) File "/home/foobar/repo/mutable-history/hgext3rd/topic/__init__.py", line 1239, in setrebaseconfig return orig(ui, repo, **opts) File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1676, in check return func(*args, **kwargs) File "/usr/local/lib/python2.7/dist-packages/hgext/rebase.py", line 921, in rebase return _dorebase(ui, repo, action, opts, inmemory=inmemory) File "/usr/local/lib/python2.7/dist-packages/hgext/rebase.py", line 975, in _dorebase return _origrebase(ui, repo, action, opts, rbsrt, inmemory=inmemory) File "/usr/local/lib/python2.7/dist-packages/hgext/rebase.py", line 1044, in _origrebase rbsrt._performrebase(tr) File "/usr/local/lib/python2.7/dist-packages/hgext/rebase.py", line 458, in _performrebase self._rebasenode(tr, rev, allowdivergence, progress) File "/usr/local/lib/python2.7/dist-packages/hgext/rebase.py", line 549, in _rebasenode dest, wctx=self.wctx) File "/usr/local/lib/python2.7/dist-packages/hgext/rebase.py", line 1267, in rebasenode labels=['dest', 'source'], wc=wctx) File "/home/foobar/repo/mutable-history/hgext3rd/topic/__init__.py", line 1186, in mergeupdatewrap ret = orig(repo, node, branchmerge, force, *args, **kwargs) File "/usr/local/lib/python2.7/dist-packages/mercurial/merge.py", line 2075, in update followcopies, matcher=matcher, mergeforce=mergeforce) File "/usr/local/lib/python2.7/dist-packages/mercurial/merge.py", line 1342, in calculateupdates acceptremote, followcopies) File "/usr/local/lib/python2.7/dist-packages/mercurial/merge.py", line 1146, in manifestmerge ret = copies.mergecopies(repo, wctx, p2, pa) File "/usr/local/lib/python2.7/dist-packages/mercurial/copies.py", line 416, in mergecopies return _fullcopytracing(repo, c1, c2, base) File "/home/foobar/repo/mutable-history/hgext3rd/evolve/compat.py", line 251, in fixedcopytracing limit = copies._findlimit(repo, c1.rev(), c2.rev()) File "/usr/local/lib/python2.7/dist-packages/mercurial/copies.py", line 49, in _findlimit a = ctxa.rev() AttributeError: 'NoneType' object has no attribute 'rev' ** Unknown exception encountered with possibly-broken third-party extension debugshell ** which supports versions unknown of Mercurial. ** Please disable debugshell and try your action again. ** If that fixes the bug please report it to the extension author. ** Python 2.7.12 (default, Nov 12 2018, 14:36:49) [GCC 5.4.0 20160609] ** Mercurial Distributed SCM (version 4.9rc0+159-30dd20a56f3e) ** Extensions loaded: releasenotes, blackbox, journal, show, patchbomb, churn, rebase, shelve, evolve, topic, absorb, fastannotate, debugshell, phabricator, bbreview Traceback (most recent call last): File
[Bug 6064] New: `hg tracked --addinclude` does not work.
https://bz.mercurial-scm.org/show_bug.cgi?id=6064
Bug ID: 6064
Summary: `hg tracked --addinclude` does not work.
Product: Mercurial
Version: 4.8
Hardware: PC
OS: Windows
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: 7895pul...@gmail.com
CC: mercurial-devel@mercurial-scm.org
Errors out with the following traceback:
```
searching for changes
adding changesets
adding manifests
adding file changes
added 0 changesets with 218 changes to 163 files
Traceback (most recent call last):
File "contrib/python/hg/mercurial/scmutil.py", line 166, in callcatch
return func()
File "contrib/python/hg/mercurial/dispatch.py", line 359, in _runcatchfunc
return _dispatch(req)
File "contrib/python/hg/mercurial/dispatch.py", line 1006, in _dispatch
cmdpats, cmdoptions)
File "contrib/python/hg/mercurial/dispatch.py", line 748, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "contrib/python/hg/mercurial/dispatch.py", line 1015, in _runcommand
return cmdfunc()
File "contrib/python/hg/mercurial/dispatch.py", line 1003, in
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "contrib/python/hg/mercurial/util.py", line 1644, in check
return func(*args, **kwargs)
File "contrib/python/hg/hgext/narrow/narrowcommands.py", line 469, in
trackedcmd
newincludes, newexcludes)
File "contrib/python/hg/hgext/narrow/narrowcommands.py", line 317, in _widen
mf = repo['.'].manifest().matches(newmatch)
File "contrib/python/hg/mercurial/manifest.py", line 1074, in matches
return self._matches(match)
File "contrib/python/hg/mercurial/manifest.py", line 1109, in _matches
m = subm._matches(match)
File "contrib/python/hg/mercurial/manifest.py", line 1110, in _matches
if not m._isempty():
File "contrib/python/hg/mercurial/manifest.py", line 771, in _isempty
self._load() # for consistency; already loaded by all callers
File "contrib/python/hg/mercurial/manifest.py", line 938, in _load
cf(self)
File "contrib/python/hg/mercurial/manifest.py", line 959, in _copyfunc
self._load()
File "contrib/python/hg/mercurial/manifest.py", line 935, in _load
lf(self)
File "contrib/python/hg/mercurial/manifest.py", line 1215, in _load_for_read
s.parse(gettext(), readsubtree)
File "contrib/python/hg/mercurial/manifest.py", line 1883, in gettext
return store.revision(self._node)
File "contrib/python/hg/mercurial/manifest.py", line 1565, in revision
return self._revlog.revision(node, _df=_df, raw=raw)
File "contrib/python/hg/mercurial/revlog.py", line 1571, in revision
rev = self.rev(node)
File "contrib/python/hg/mercurial/revlog.py", line 578, in rev
raise error.LookupError(node, self.indexfile, _('no node'))
LookupError: meta/f1/f2/00manifest.i@abcdef123456: no node
abort: meta/f1/f2/00manifest.i@abcdef123456: no node!
```
--
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
[Bug 6063] New: `hg update` on windows says "The system cannot find specified path"
https://bz.mercurial-scm.org/show_bug.cgi?id=6063 Bug ID: 6063 Summary: `hg update` on windows says "The system cannot find specified path" Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org `hg update` on a new cloned repository aborts saying "The system cannot find the specified path". Following is the traceback: ``` Traceback (most recent call last): File "contrib/python/hg/mercurial/scmutil.py", line 166, in callcatch return func() File "contrib/python/hg/mercurial/dispatch.py", line 359, in _runcatchfunc return _dispatch(req) File "contrib/python/hg/mercurial/dispatch.py", line 1006, in _dispatch cmdpats, cmdoptions) File "contrib/python/hg/mercurial/dispatch.py", line 748, in runcommand ret = _runcommand(ui, options, cmd, d) File "contrib/python/hg/mercurial/dispatch.py", line 1015, in _runcommand return cmdfunc() File "contrib/python/hg/mercurial/dispatch.py", line 1003, in d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "contrib/python/hg/mercurial/util.py", line 1644, in check return func(*args, **kwargs) File "contrib/python/hg/mercurial/commands.py", line 6094, in update updatecheck=updatecheck) File "vcs/hg/client/hgext3rd/narrowupdate.py", line 31, in wrapupdatetotally ret = orig(ui, repo, checkout, brev, **opts) File "contrib/python/hg/mercurial/hg.py", line 921, in updatetotally ret = _update(repo, checkout, updatecheck=updatecheck) File "contrib/python/hg/mercurial/hg.py", line 858, in update stats = updaterepo(repo, node, False, updatecheck=updatecheck) File "contrib/python/hg/mercurial/hg.py", line 854, in updaterepo updatecheck=updatecheck) File "contrib/python/hg/mercurial/extensions.py", line 417, in closure return func(*(args + a), **kw) File "contrib/python/hg/hgext/fsmonitor/__init__.py", line 753, in wrapupdate labels, matcher, **kwargs) File "contrib/python/hg/mercurial/merge.py", line 2178, in update stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) File "contrib/python/hg/mercurial/merge.py", line 1646, in applyupdates for i, item in prog: File "contrib/python/hg/mercurial/merge.py", line 1510, in batchget atomictemp=atomictemp) File "contrib/python/hg/mercurial/context.py", line 1668, in write **kwargs) File "contrib/python/hg/mercurial/localrepo.py", line 1662, in wwrite **kwargs) File "contrib/python/hg/mercurial/vfs.py", line 86, in write with self(path, 'wb', backgroundclose=backgroundclose, **kwargs) as fp: File "contrib/python/hg/mercurial/vfs.py", line 413, in __call__ fp = util.posixfile(f, mode) File "contrib/python/hg/mercurial/windows.py", line 168, in posixfile encoding.strfromlocal(name), err.strerror)) IOError: [Errno 2] : The system cannot find the path specified abort: : The system cannot find the path specified ``` Happens with both workers enabled and disabled. I am using command prompt in windows. Interesting thing is is of the form: "D:\SRC\pulkit\repo_root\some_folder_in_repo/subfolder/subfolder2/some_file" The path is shortened up. The interesting part is that the path initially has '\' and then has '/' as separator. -- 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
[Bug 6062] New: `hg uncommit --interactive` would be very useful
https://bz.mercurial-scm.org/show_bug.cgi?id=6062 Bug ID: 6062 Summary: `hg uncommit --interactive` would be very useful Product: Mercurial Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: hoo...@google.com CC: mercurial-devel@mercurial-scm.org This is supported in the evolve extension's version of uncommit, but not in the core extension. It is very useful, and the workaround along the lines of `hg uncommit --keep && hg commit -i` is awkward and less obvious. -- 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
[Bug 6061] New: tests fail with tls 1.0 and 1.1 disabled
https://bz.mercurial-scm.org/show_bug.cgi?id=6061 Bug ID: 6061 Summary: tests fail with tls 1.0 and 1.1 disabled Product: Mercurial Version: stable branch Hardware: All OS: All Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: duri...@gmail.com CC: mercurial-devel@mercurial-scm.org Specifically test-https.t: @@ -355,15 +355,11 @@ Setting ciphers to an invalid value aborts $ P="$CERTSDIR" hg --config hostsecurity.ciphers=invalid -R copy-pull id https://localhost:$HGPORT/ warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?) - abort: could not set ciphers: No cipher can be selected. - (change cipher string (invalid) in config) - [255] + 5fed3813f7f5 $ P="$CERTSDIR" hg --config hostsecurity.localhost:ciphers=invalid -R copy-pull id https://localhost:$HGPORT/ warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?) - abort: could not set ciphers: No cipher can be selected. - (change cipher string (invalid) in config) - [255] + 5fed3813f7f5 Changing the cipher string works @@ -461,9 +457,15 @@ Clients talking same TLS versions work $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.0 id https://localhost:$HGPORT/ - 5fed3813f7f5 + (could not communicate with localhost using security protocols tls1.0, tls1.1, tls1.2; if you are using a modern Mercurial version, consider contacting the operator of this server; see https://mercurial-scm.org/wiki/SecureConnections for more info) + abort: error: [SSL: UNSUPPORTED_PROTOCOL] unsupported protocol (_ssl.c:727) + [255] $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.1 id https://localhost:$HGPORT1/ - 5fed3813f7f5 + (could not negotiate a common security protocol (tls1.1+) with localhost; the likely cause is Mercurial is configured to be more secure than the server can support) + (consider contacting the operator of this server and ask them to support modern TLS protocol versions; or, set hostsecurity.localhost:minimumprotocol=tls1.0 to allow use of legacy, less secure protocols when communicating with this server) + (see https://mercurial-scm.org/wiki/SecureConnections for more info) + abort: error: [SSL: UNSUPPORTED_PROTOCOL] unsupported protocol (_ssl.c:727) + [255] $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.2 id https://localhost:$HGPORT2/ 5fed3813f7f5 @@ -498,15 +500,18 @@ --insecure will allow TLS 1.0 connections and override configs $ hg --config hostsecurity.minimumprotocol=tls1.2 id --insecure https://localhost:$HGPORT1/ - warning: connection security to localhost is disabled per current settings; communication is susceptible to eavesdropping and tampering - 5fed3813f7f5 + (could not communicate with localhost using security protocols tls1.0, tls1.1, tls1.2; if you are using a modern Mercurial version, consider contacting the operator of this server; see https://mercurial-scm.org/wiki/SecureConnections for more info) + abort: error: [SSL: UNSUPPORTED_PROTOCOL] unsupported protocol (_ssl.c:727) + [255] The per-host config option overrides the default $ P="$CERTSDIR" hg id https://localhost:$HGPORT/ \ > --config hostsecurity.minimumprotocol=tls1.2 \ > --config hostsecurity.localhost:minimumprotocol=tls1.0 - 5fed3813f7f5 + (could not communicate with localhost using security protocols tls1.0, tls1.1, tls1.2; if you are using a modern Mercurial version, consider contacting the operator of this server; see https://mercurial-scm.org/wiki/SecureConnections for more info) + abort: error: [SSL: UNSUPPORTED_PROTOCOL] unsupported protocol (_ssl.c:727) + [255] The per-host config option by itself works @@ -624,7 +629,7 @@ $ P="$CERTSDIR" hg id https://localhost:$HGPORT/ warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?) - abort: error: *handshake failure* (glob) + abort: error: [SSL] tlsv13 alert certificate required (_ssl.c:1942) [255] with client certificate: fails that way on both Debian testing and FreeBSD 12. -- 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
[Bug 6060] New: Cloning a repository with --debug fails
https://bz.mercurial-scm.org/show_bug.cgi?id=6060 Bug ID: 6060 Summary: Cloning a repository with --debug fails Product: Mercurial Version: 4.8.1 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: datoo...@gmail.com CC: mercurial-devel@mercurial-scm.org We are having issue cloning the following repository: https://bitbucket.org/felicitasmedia/gnatta/src/default/\\ The majority of our users cannot clone the repository. This means that our build agents can no longer update, this means we can't build the solution. I have tried both https & ssh but this fails. The following error occurs consistently: applying clone bundle from https://api.media.atlassian.com/file/5a2c9657-2e8b-4e82-bba4-15f3307ba404/binary?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJjMWNiYzdhYy01Mzc1LTQ1YTktYTQ5MS05N2IyYjllYWIzYTUiLCJhY2Nlc3MiOnsidXJuOmZpbGVzdG9yZTpmaWxlOjVhMmM5NjU3LTJlOGItNGU4Mi1iYmE0LTE1ZjMzMDdiYTQwNCI6WyJyZWFkIl19LCJuYmYiOjE1NDgyMzM5NjUsImV4cCI6MTU0ODIzNDM4NX0.aS1x3hujgsFVTzCmpVRM_Rq_YDIBSm6pL05ZilRO3qo=c1cbc7ac-5375-45a9-a491-97b2b9eab3a5\\ adding changesets files [==> ] 12531/22465 1m13ssts adding file changes transaction abort! rollback completed ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker\\ ** Python 2.7.15 (v2.7.15:ca079a3ea3, Apr 30 2018, 16:30:26) [MSC v.1500 64 bit (AMD64)] ** Mercurial Distributed SCM (version 4.6.1) ** Extensions loaded: Traceback (most recent call last): File "hg", line 41, in File "mercurial\dispatch.pyc", line 90, in run File "mercurial\dispatch.pyc", line 210, in dispatch File "mercurial\dispatch.pyc", line 351, in _runcatch File "mercurial\dispatch.pyc", line 359, in _callcatch File "mercurial\scmutil.pyc", line 160, in callcatch File "mercurial\dispatch.pyc", line 341, in _runcatchfunc File "mercurial\dispatch.pyc", line 971, in _dispatch File "mercurial\dispatch.pyc", line 727, in runcommand File "mercurial\dispatch.pyc", line 979, in _runcommand File "mercurial\dispatch.pyc", line 968, in File "mercurial\util.pyc", line 1553, in check File "mercurial\commands.pyc", line 1467, in clone File "mercurial\hg.pyc", line 709, in clone File "mercurial\exchange.pyc", line 1482, in pull File "mercurial\exchange.pyc", line 2213, in _maybeapplyclonebundle File "mercurial\exchange.pyc", line 2409, in trypullbundlefromurl File "mercurial\bundle2.pyc", line 353, in applybundle File "mercurial\bundle2.pyc", line 460, in processbundle File "mercurial\bundle2.pyc", line 467, in processparts File "mercurial\bundle2.pyc", line 423, in __exit__ zlib.error: Error -3 while decompressing: invalid block type I have upgrade to the latest version of Mercurial and get the following: $ hg clone ssh://h...@bitbucket.org/felicitasmedia/gnatta destination directory: gnatta applying clone bundle from https://api.media.atlassian.com/file/5a2c9657-2e8b-4e82-bba4-15f3307ba404/binary?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJjMWNiYzdhYy01Mzc1LTQ1YTktYTQ5MS05N2IyYjllYWIzYTUiLCJhY2Nlc3MiOnsidXJuOmZpbGVzdG9yZTpmaWxlOjVhMmM5NjU3LTJlOGItNGU4Mi1iYmE0LTE1ZjMzMDdiYTQwNCI6WyJyZWFkIl19LCJuYmYiOjE1NDgyMzgyNjUsImV4cCI6MTU0ODIzODY4NX0.DXPIvdVFkkfCEYNnDNP6uCjTrmW6CZenxMTsMU1Totg=c1cbc7ac-5375-45a9-a491-97b2b9eab3a5 adding changesets adding manifests adding file changes transaction abort! rollback completed ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)] ** Mercurial Distributed SCM (version 4.4.1) ** Extensions loaded: Traceback (most recent call last): File "hg", line 41, in File "mercurial\dispatch.pyc", line 85, in run File "mercurial\dispatch.pyc", line 173, in dispatch File "mercurial\dispatch.pyc", line 313, in _runcatch File "mercurial\dispatch.pyc", line 321, in _callcatch File "mercurial\scmutil.pyc", line 154, in callcatch File "mercurial\dispatch.pyc", line 303, in _runcatchfunc File "mercurial\dispatch.pyc", line 940, in _dispatch File "mercurial\dispatch.pyc", line 701, in runcommand File "mercurial\dispatch.pyc", line 948, in _runcommand File "mercurial\dispatch.pyc", line 937, in File "mercurial\util.pyc", line 1183, in check File "mercurial\commands.pyc", line 1425, in clone File "mercurial\hg.pyc", line 670, in clone File "mercurial\exchange.pyc", line 1294, in pull File "mercurial\exchange.pyc", line 1936, in _maybeapplyclonebundle File "mercurial\exchange.pyc", line 2119, in trypullbundlefromurl File "mercurial\bundle2.pyc", line 342, in applybundle File "mercurial\bundle2.pyc", line 449, in processbundle File "mercurial\bundle2.pyc", line 456, in processparts
[Bug 6059] New: `hg files` regression on c2aea007
https://bz.mercurial-scm.org/show_bug.cgi?id=6059
Bug ID: 6059
Summary: `hg files` regression on c2aea007
Product: Mercurial
Version: 4.9rc0
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: lothiral...@gmail.com
CC: mercurial-devel@mercurial-scm.org
Our performance test suite identified an `hg files` regression on c2aea007
Here are the numbers:
Benchmarks that have got worse:
before after ratio
[197f092b] [593718ff]
+ 739±4ms 871±5ms 1.18
time_files('mozilla-central-2018-08-01')
+ 748±7ms 872±5ms 1.17
time_files('mozilla-central-2018-08-01-sparse-revlog')
+ 353±2ms 399±2ms 1.13 time_files('netbeans-2018-08-01')
+ 352±2ms 397±2ms 1.13
time_files('netbeans-2018-08-01-sparse-revlog')
I took a quick look at the commit but I don't know if that's an overhead from
the `_isbuffered` call, the additional `ifs` or another part of the change.
This regression is likely to impact others commands but with much less impact
than `hg files`.
--
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
[Bug 6058] New: clone repo failed
https://bz.mercurial-scm.org/show_bug.cgi?id=6058 Bug ID: 6058 Summary: clone repo failed Product: Mercurial Version: 4.8.1 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: michae...@arctrade.com CC: mercurial-devel@mercurial-scm.org Starting yesterday we start to have problem clone repo either from bitbucket or from local. we are uinsg TortoiseHg version 4.8.2 with Mercurial-4.8.2, Python-2.7.13, PyQt-5.9.1, Qt-5.9.2 the repo we are having difficulties to clone has around 6600 changeset, not sure if that is a factor or not. the trace log as: cloning subrepo ArcTrade.Common from https://bitbucket.org/ArcTrade/hgarctrade.common applying clone bundle from https://api.media.atlassian.com/file/a27bbfc8-25f0-4d89-9e08-64deac708bfe/binary?client=8ba980a1-24a3-4554-a806-39d3890d6222=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhY2Nlc3MiOnsidXJuOmZpbGVzdG9yZTpmaWxlOmEyN2JiZmM4LTI1ZjAtNGQ4OS05ZTA4LTY0ZGVhYzcwOGJmZSI6WyJyZWFkIl19LCJleHAiOjE1NDgyNjU4NjgsImlzcyI6IjhiYTk4MGExLTI0YTMtNDU1NC1hODA2LTM5ZDM4OTBkNjIyMiIsIm5iZiI6MTU0ODI2NTQ0OH0.2S0Xq0_zglchixhfsq8NwCd5nM0ydM_OlwW2S-z4QVw adding changesets adding manifests adding file changes transaction abort! rollback completed (sent 3 HTTP requests and 767 bytes; received 928 bytes in responses) ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)] ** Mercurial Distributed SCM (version 4.8.2) ** Extensions loaded: tortoisehg.util.hgcommands, tortoisehg.util.partialcommit, tortoisehg.util.pipeui, tortoisehg.util.win32ill, tortoisehg.util.hgdispatch ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)] ** Mercurial Distributed SCM (version 4.8.2) ** Extensions loaded: tortoisehg.util.hgcommands, tortoisehg.util.partialcommit, tortoisehg.util.pipeui, tortoisehg.util.win32ill, tortoisehg.util.hgdispatch Traceback (most recent call last): File "hg", line 50, in File "mercurial\dispatch.pyo", line 96, in run File "mercurial\dispatch.pyo", line 220, in dispatch File "mercurial\dispatch.pyo", line 363, in _runcatch File "mercurial\dispatch.pyo", line 371, in _callcatch File "mercurial\scmutil.pyo", line 166, in callcatch File "mercurial\dispatch.pyo", line 354, in _runcatchfunc File "mercurial\dispatch.pyo", line 994, in _dispatch File "mercurial\dispatch.pyo", line 737, in runcommand File "mercurial\dispatch.pyo", line 1003, in _runcommand File "mercurial\dispatch.pyo", line 991, in File "mercurial\util.pyo", line 1644, in check File "mercurial\commands.pyo", line 5210, in serve File "mercurial\server.pyo", line 147, in runservice File "mercurial\commandserver.pyo", line 325, in run File "mercurial\commandserver.pyo", line 301, in serve File "mercurial\commandserver.pyo", line 276, in serveone File "mercurial\commandserver.pyo", line 260, in runcommand File "mercurial\dispatch.pyo", line 220, in dispatch File "mercurial\dispatch.pyo", line 363, in _runcatch File "mercurial\dispatch.pyo", line 371, in _callcatch File "mercurial\scmutil.pyo", line 166, in callcatch File "mercurial\dispatch.pyo", line 354, in _runcatchfunc File "tortoisehg\util\hgdispatch.pyo", line 23, in _dispatch File "mercurial\dispatch.pyo", line 994, in _dispatch File "mercurial\dispatch.pyo", line 737, in runcommand File "mercurial\dispatch.pyo", line 1003, in _runcommand File "mercurial\dispatch.pyo", line 991, in File "mercurial\util.pyo", line 1644, in check File "mercurial\commands.pyo", line 1557, in clone File "mercurial\hg.pyo", line 827, in clone File "mercurial\hg.pyo", line 858, in update File "mercurial\hg.pyo", line 854, in updaterepo File "mercurial\merge.pyo", line 2178, in update File "mercurial\merge.pyo", line 1651, in applyupdates File "mercurial\subrepoutil.pyo", line 226, in submerge File "mercurial\subrepo.pyo", line 75, in decoratedmethod File "mercurial\subrepo.pyo", line 681, in get File "mercurial\subrepo.pyo", line 665, in _get File "mercurial\hg.pyo", line 756, in clone File "mercurial\exchange.pyo", line 1524, in pull File "mercurial\exchange.pyo", line 2452, in _maybeapplyclonebundle File "mercurial\exchange.pyo", line 2648, in trypullbundlefromurl File "mercurial\bundle2.pyo", line 353, in applybundle File "mercurial\bundle2.pyo", line 460, in processbundle File "mercurial\bundle2.pyo", line 467, in processparts File "mercurial\bundle2.pyo", line 423, in __exit__ zlib.error: Error -3 while decompressing: invalid literal/length code cmdserver: process exited
[Bug 6057] New: Server side exceptions after upgrade of evolve from 8.0.3 to 8.3.3
https://bz.mercurial-scm.org/show_bug.cgi?id=6057 Bug ID: 6057 Summary: Server side exceptions after upgrade of evolve from 8.0.3 to 8.3.3 Product: Mercurial Version: unspecified Hardware: PC OS: Mac OS Status: UNCONFIRMED Severity: feature Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: mar...@python-blog.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org We were using evolve 8.0.3 + mercurial 4.6.2 For a long time without any issues. Recently we upgraded evolve to the latest 8.3.3 Since some time we're seeing odd exceptions on pull/push. Server-side evolve is not even enabled !!! We only have large files/hg-svn enabled, on some of the repositories. The issue is resolved once we activate evolve, then we're able to push. We all use latest stable mercurial client with evolve activated 4.8.2 Is this some kind of caching issue? We have multi-process workers each having it's own process and Mercurial. The UI config that controls extensions for each call is instantiated on demand. Here are the exceptions we're seeing: 1) File "/nix/store/iwik5zna6impy0bgj1cximdyrr0h1yms-python2.7-pyramid-1.10.1/lib/python2.7/site-packages/pyramid/tweens.py", line 43, in excview_tween response = _error_handler(request, exc) File "/nix/store/iwik5zna6impy0bgj1cximdyrr0h1yms-python2.7-pyramid-1.10.1/lib/python2.7/site-packages/pyramid/tweens.py", line 13, in _error_handler response = request.invoke_exception_view(exc_info) File "/nix/store/iwik5zna6impy0bgj1cximdyrr0h1yms-python2.7-pyramid-1.10.1/lib/python2.7/site-packages/pyramid/view.py", line 757, in invoke_exception_view request_iface=request_iface.combined, File "/nix/store/iwik5zna6impy0bgj1cximdyrr0h1yms-python2.7-pyramid-1.10.1/lib/python2.7/site-packages/pyramid/view.py", line 657, in _call_view response = view_callable(context, request) File "/nix/store/iwik5zna6impy0bgj1cximdyrr0h1yms-python2.7-pyramid-1.10.1/lib/python2.7/site-packages/pyramid/viewderivers.py", line 401, in viewresult_to_response result = view(context, request) File "/nix/store/iwik5zna6impy0bgj1cximdyrr0h1yms-python2.7-pyramid-1.10.1/lib/python2.7/site-packages/pyramid/viewderivers.py", line 95, in mapped_view return _mapped_view(context, request) File "/home/rhodecode/source_vcs/vcsserver/http_main.py", line 589, in handle_vcs_exception raise exception AttributeError: 'lfilesrepo' object has no attribute 'stablerange' 2) File "/nix/store/vywpnmrg2gjvqqxr1k31h6q18pp4naza-python2.7-mercurial-4.6.2/lib/python2.7/site-packages/mercurial/hgweb/hgweb_mod.py", line 308, in run_wsgi for r in self._runwsgi(req, res, repo): File "/home/rhodecode/source_vcs/vcsserver/scm_app.py", line 106, in _runwsgi return super(HgWeb, self)._runwsgi(req, res, repo) File "/nix/store/vywpnmrg2gjvqqxr1k31h6q18pp4naza-python2.7-mercurial-4.6.2/lib/python2.7/site-packages/mercurial/hgweb/hgweb_mod.py", line 334, in _runwsgi rctx, req, res, self.check_perm) File "/nix/store/vywpnmrg2gjvqqxr1k31h6q18pp4naza-python2.7-mercurial-4.6.2/lib/python2.7/site-packages/mercurial/wireprotoserver.py", line 224, in handlewsgirequest _callhttp(repo, req, res, proto, cmd) File "/nix/store/vywpnmrg2gjvqqxr1k31h6q18pp4naza-python2.7-mercurial-4.6.2/lib/python2.7/site-packages/mercurial/wireprotoserver.py", line 439, in _callhttp rsp = wireprotov1server.dispatch(repo, proto, cmd) File "/nix/store/vywpnmrg2gjvqqxr1k31h6q18pp4naza-python2.7-mercurial-4.6.2/lib/python2.7/site-packages/mercurial/wireprotov1server.py", line 75, in dispatch return func(repo, proto, *args) File "/nix/store/9j57kfqw59zzhbk69dxis0ydm1j4ng83-python2.7-hg-evolve-8.3.3/lib/python2.7/site-packages/hgext3rd/evolve/obsdiscovery.py", line 774, in srv_obshashrange_v1 hashes = _obshashrange_v0(repo, ranges) File "/nix/store/9j57kfqw59zzhbk69dxis0ydm1j4ng83-python2.7-hg-evolve-8.3.3/lib/python2.7/site-packages/hgext3rd/evolve/obsdiscovery.py", line 730, in _obshashrange_v0 repo.stablerange.warmup(repo, upto=maxrev) File "/nix/store/vywpnmrg2gjvqqxr1k31h6q18pp4naza-python2.7-mercurial-4.6.2/lib/python2.7/site-packages/mercurial/repoview.py", line 255, in __getattr__ return getattr(self._unfilteredrepo, attr) AttributeError: 'lfilesrepo' object has no attribute 'stablerange' 3) File "/nix/store/iwik5zna6impy0bgj1cximdyrr0h1yms-python2.7-pyramid-1.10.1/lib/python2.7/site-packages/pyramid/tweens.py", line 43, in excview_tween response = _error_handler(request, exc) File "/nix/store/iwik5zna6impy0bgj1cximdyrr0h1yms-python2.7-pyramid-1.10.1/lib/python2.7/site-packages/pyramid/tweens.py", line 13, in _error_handler response = request.invoke_exception_view(exc_info) File
[Bug 6056] New: commit fails on non-generaldelta repositories
https://bz.mercurial-scm.org/show_bug.cgi?id=6056 Bug ID: 6056 Summary: commit fails on non-generaldelta repositories Product: Mercurial Version: stable branch Hardware: PC OS: Windows Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: mathias.dem...@gmail.com CC: mercurial-devel@mercurial-scm.org It appears we still have some non-generaldelta repositories, and I just bumped into an issue with one of them. This occurs on 4.9rc0+11-13c23396c7fe: env HGRCPATH= HGPLAIN= hg commit -u foo -m "foo" transaction abort! rollback completed ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.5 (default, Jul 13 2018, 13:06:57) [GCC 4.8.5 20150623 (Red Hat 4.8.5-28)] ** Mercurial Distributed SCM (version 4.9rc0+11-13c23396c7fe) ** Extensions loaded: Traceback (most recent call last): File "/bin/hg", line 43, in dispatch.run() File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 99, in run status = dispatch(req) File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 225, in dispatch ret = _runcatch(req) or 0 File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 376, in _runcatch return _callcatch(ui, _runcatchfunc) File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 384, in _callcatch return scmutil.callcatch(ui, func) File "/usr/lib64/python2.7/site-packages/mercurial/scmutil.py", line 165, in callcatch return func() File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 367, in _runcatchfunc return _dispatch(req) File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 1021, in _dispatch cmdpats, cmdoptions) File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 756, in runcommand ret = _runcommand(ui, options, cmd, d) File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 1030, in _runcommand return cmdfunc() File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 1018, in d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/usr/lib64/python2.7/site-packages/mercurial/util.py", line 1670, in check return func(*args, **kwargs) File "/usr/lib64/python2.7/site-packages/mercurial/commands.py", line 1644, in commit return _docommit(ui, repo, *pats, **opts) File "/usr/lib64/python2.7/site-packages/mercurial/commands.py", line 1719, in _docommit node = cmdutil.commit(ui, repo, commitfunc, pats, opts) File "/usr/lib64/python2.7/site-packages/mercurial/cmdutil.py", line 2397, in commit return commitfunc(ui, repo, message, matcher, opts) File "/usr/lib64/python2.7/site-packages/mercurial/commands.py", line 1717, in commitfunc extra=extra) File "/usr/lib64/python2.7/site-packages/mercurial/localrepo.py", line 158, in wrapper return orig(repo.unfiltered(), *args, **kwargs) File "/usr/lib64/python2.7/site-packages/mercurial/localrepo.py", line 2477, in commit ret = self.commitctx(cctx, True) File "/usr/lib64/python2.7/site-packages/mercurial/localrepo.py", line 158, in wrapper return orig(repo.unfiltered(), *args, **kwargs) File "/usr/lib64/python2.7/site-packages/mercurial/localrepo.py", line 2587, in commitctx added, drop, match=self.narrowmatch()) File "/usr/lib64/python2.7/site-packages/mercurial/manifest.py", line 1749, in write p1, p2, added, removed, match=match) File "/usr/lib64/python2.7/site-packages/mercurial/manifest.py", line 1493, in add cachedelta) File "/usr/lib64/python2.7/site-packages/mercurial/revlog.py", line 1885, in addrevision deltacomputer=deltacomputer) File "/usr/lib64/python2.7/site-packages/mercurial/revlog.py", line 1900, in addrawrevision deltacomputer=deltacomputer) File "/usr/lib64/python2.7/site-packages/mercurial/revlog.py", line 2028, in _addrevision deltainfo = deltacomputer.finddeltainfo(revinfo, fh) File "/usr/lib64/python2.7/site-packages/mercurial/revlogutils/deltas.py", line 995, in finddeltainfo candidaterevs = next(groups) File "/usr/lib64/python2.7/site-packages/mercurial/revlogutils/deltas.py", line 643, in _candidategroups temptative = candidates.send(good) File "/usr/lib64/python2.7/site-packages/mercurial/revlogutils/deltas.py", line 717, in _refinedgroups for candidates in _rawgroups(revlog, p1, p2, cachedelta, snapshots): File "/usr/lib64/python2.7/site-packages/mercurial/revlogutils/deltas.py", line 778, in _rawgroups if sparse and parents: UnboundLocalError: local variable 'parents' referenced before assignment -- You are receiving this mail because: You are on the CC list for the bug. ___ Mercurial-devel mailing list
[Bug 6055] New: {latesttags} and friends raise a revspec parse error for uncommitted merges
https://bz.mercurial-scm.org/show_bug.cgi?id=6055
Bug ID: 6055
Summary: {latesttags} and friends raise a revspec parse error
for uncommitted merges
Product: Mercurial
Version: default branch
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: bug
Priority: normal
Component: templater
Assignee: bugzi...@mercurial-scm.org
Reporter: matt_harbi...@yahoo.com
CC: mercurial-devel@mercurial-scm.org
It works fine for committed merges and normal commits. But:
$ hg merge
$ hg id -T '{latesttag}+{changessincelatesttag}-{p1node}{dirty}' --traceback
Traceback (most recent call last):
File "d:\mercurial\mercurial\scmutil.py", line 165, in callcatch
return func()
File "d:\mercurial\mercurial\dispatch.py", line 367, in _runcatchfunc
return _dispatch(req)
File "d:\mercurial\mercurial\dispatch.py", line 1021, in _dispatch
cmdpats, cmdoptions)
File "d:\mercurial\mercurial\dispatch.py", line 756, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "d:\mercurial\mercurial\dispatch.py", line 1030, in _runcommand
return cmdfunc()
File "d:\mercurial\mercurial\dispatch.py", line 1018, in
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "d:\mercurial\mercurial\util.py", line 1670, in check
return func(*args, **kwargs)
File "d:\mercurial\mercurial\commands.py", line 3311, in identify
fm.end()
File "d:\mercurial\mercurial\formatter.py", line 435, in end
baseformatter.end(self)
File "d:\mercurial\mercurial\formatter.py", line 239, in end
self._showitem()
File "d:\mercurial\mercurial\formatter.py", line 418, in _showitem
self._renderitem(self._tref, item)
File "d:\mercurial\mercurial\formatter.py", line 424, in _renderitem
self._out.write(self._t.render(ref, item))
File "d:\mercurial\mercurial\templater.py", line 937, in render
return b''.join(self.generate(t, mapping))
File "d:\mercurial\mercurial\util.py", line 1581, in increasingchunks
for chunk in source:
File "d:\mercurial\mercurial\templateutil.py", line 721, in flatten
for i in thing:
File "d:\mercurial\mercurial\templateutil.py", line 915, in runtemplate
yield evalrawexp(context, mapping, arg)
File "d:\mercurial\mercurial\templateutil.py", line 769, in evalrawexp
return func(context, mapping, data)
File "d:\mercurial\mercurial\templateutil.py", line 907, in runsymbol
return v(context, mapping)
File "d:\mercurial\mercurial\templatekw.py", line 428, in showlatesttag
return showlatesttags(context, mapping, None)
File "d:\mercurial\mercurial\templatekw.py", line 432, in showlatesttags
latesttags = getlatesttags(context, mapping, pattern)
File "d:\mercurial\mercurial\templatekw.py", line 89, in getlatesttags
pdate, pdist, ptag = max(ptags, key=key)
File "d:\mercurial\mercurial\templatekw.py", line 85, in key
ctx.rev(), x[2][0]))
File "d:\mercurial\mercurial\localrepo.py", line 1365, in revs
tree = revsetlang.spectree(expr, *args)
File "d:\mercurial\mercurial\revsetlang.py", line 697, in spectree
parsed = _parseargs(expr, args)
File "d:\mercurial\mercurial\revsetlang.py", line 775, in _parseargs
raise error.ParseError(_('invalid argument for revspec'))
ParseError: invalid argument for revspec
hg: parse error: invalid argument for revspec
This was with 4.8.2+810-593f6359681d. I didn't go back to see where it broke.
--
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
[Bug 6054] New: Merge conflict not found if file only contains one line
https://bz.mercurial-scm.org/show_bug.cgi?id=6054 Bug ID: 6054 Summary: Merge conflict not found if file only contains one line Product: Mercurial Version: 4.8 Hardware: Other OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: carl.bar...@wirefast.com CC: mercurial-devel@mercurial-scm.org In order to have a play with mercurial, I created a repository with a single file that contained a single line of text. I then played around changing the contents of the file (but always only a single line) until I got two heads. When I did a merge between the heads, mercurial simply replaced the current version of the file with the version from the new branch. However, if the file had two or more lines, the merge reported a conflict. -- 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
[Bug 6053] New: evolve can fall into unrecoverable state
https://bz.mercurial-scm.org/show_bug.cgi?id=6053 Bug ID: 6053 Summary: evolve can fall into unrecoverable state Product: Mercurial Version: 4.8.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: akhil...@google.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org Context: From #mercurial and #hg-evolve Owls: I cannot update/commit/amend because I have an evolve in progress. I cannot evolve because I have an outstanding uncommitted merge. I cannot merge because my working directory is not at a head revision. marmoute: just `rm .hg/evolvestate` and then hg up -C ." This resolves the problem, but ideally it should not be possible to get into this state. -- 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
[Bug 6052] New: Merge with large number of changes corrupts repository
https://bz.mercurial-scm.org/show_bug.cgi?id=6052 Bug ID: 6052 Summary: Merge with large number of changes corrupts repository Product: Mercurial Version: 4.8.1 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: rnaga...@gmail.com CC: mercurial-devel@mercurial-scm.org I performed a merge from a parent branch to a child branch. There was a major refactor in the parent branch including moving files around. The child merge had 1490 files update. After the commit the repository was permanently corrupted (i.e. I couldn't do anything with it, even verify it). Command sequence: hg merge release_10_1 hg commit -m "Merge from release_10_1" hg status ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)] ** Mercurial Distributed SCM (version 4.7+11-cee9043c7dba) ** Extensions loaded: eol Traceback (most recent call last): File "hg", line 50, in File "mercurial\dispatch.pyo", line 90, in run File "mercurial\dispatch.pyo", line 213, in dispatch File "mercurial\dispatch.pyo", line 354, in _runcatch File "mercurial\dispatch.pyo", line 362, in _callcatch File "mercurial\scmutil.pyo", line 161, in callcatch File "mercurial\dispatch.pyo", line 344, in _runcatchfunc File "mercurial\dispatch.pyo", line 945, in _dispatch File "mercurial\hg.pyo", line 179, in repository File "mercurial\hg.pyo", line 170, in _peerorrepo File "hgext\eol.pyo", line 421, in reposetup File "hgext\eol.pyo", line 339, in _hgcleardirstate File "hgext\eol.pyo", line 332, in loadeol File "hgext\eol.pyo", line 242, in parseeol File "mercurial\context.pyo", line 85, in __getitem__ File "mercurial\context.pyo", line 553, in filectx File "mercurial\context.pyo", line 268, in filenode File "mercurial\context.pyo", line 260, in _fileinfo File "mercurial\manifest.pyo", line 1457, in find File "mercurial\manifest.pyo", line 1427, in read File "mercurial\manifest.pyo", line 373, in __init__ File "mercurial\manifest.pyo", line 126, in __init__ File "mercurial\manifest.pyo", line 148, in findlines ValueError: Manifest lines not in sorted order. I've seen a similar bug in the TortoiseHg bug tracker, but for some reason it was closed: https://bitbucket.org/tortoisehg/thg/issues/5262/valueerror-manifest-lines-not-in-sorted The resolution to this was to revert back to Mercurial 4.7.1, as mentioned in the tortoise hg bug. FYI the mercurial version on our server is 4.2.1. -- 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
[Bug 6051] New: Color on stderr falls back to ANSI on Windows with stdout redirected to N
https://bz.mercurial-scm.org/show_bug.cgi?id=6051 Bug ID: 6051 Summary: Color on stderr falls back to ANSI on Windows with stdout redirected to N Product: Mercurial Version: 4.8.1 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Priority: normal Component: color Assignee: bugzi...@mercurial-scm.org Reporter: matt_harbi...@yahoo.com CC: mercurial-devel@mercurial-scm.org $ hg log -r 1 abort: unknown revision '1'! <-- text in red $ ../hg log -r 1 >/dev/null ←[0;31mabort: unknown revision '1'!←[0m Interestingly, the error text is also mangled on Windows 10. There must be more to it than only checking stdout in win32.enablevtmode(), because changing that to stderr has no effect. If the redirect is to a file, there are no ANSI codes in the output, but no color either (on either Win7 or Win10). Maybe it's related to NUL being reported as a tty? But I'm not sure why it wouldn't stick with win32 color mode. -- 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
[Bug 6050] New: `hg split` fails on long paths
https://bz.mercurial-scm.org/show_bug.cgi?id=6050 Bug ID: 6050 Summary: `hg split` fails on long paths Product: Mercurial Version: 4.8 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: martinv...@google.com CC: mercurial-devel@mercurial-scm.org To repro: hg init NAME=QWERTYUIOP while true do mkdir $NAME cd $NAME hg st > /dev/null || break done cd .. rmdir $NAME echo a > a echo b > b hg ci -Aqm x hg split # select one of the files (or both) abort: File name too long: '/.hg/record-backups/<"QWERTYUIOP_" repeated many times>a.BvtYg5' -- 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
[Bug 6049] New: `hg split` fails on long paths
https://bz.mercurial-scm.org/show_bug.cgi?id=6049 Bug ID: 6049 Summary: `hg split` fails on long paths Product: Mercurial Version: 4.8 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: martinv...@google.com CC: mercurial-devel@mercurial-scm.org To repro: hg init NAME=QWERTYUIOP while true do mkdir $NAME cd $NAME hg st > /dev/null || break done cd .. rmdir $NAME echo a > a echo b > b hg ci -Aqm x hg split # select one of the files (or both) abort: File name too long: '/.hg/record-backups/<"QWERTYUIOP_" repeated many times>a.BvtYg5' -- 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
[Bug 6048] New: splitting a secret commit produces drafts
https://bz.mercurial-scm.org/show_bug.cgi?id=6048 Bug ID: 6048 Summary: splitting a secret commit produces drafts Product: Mercurial Version: stable branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: z...@zash.se CC: mercurial-devel@mercurial-scm.org $ seq 1 10 > foo.txt $ hg ci -sAm foo $ hg split (split the commit into whatever) $ hg phase expect: secret actual: draft -- 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
[Bug 6047] New: Interactive commit does not work as expected with copied files
https://bz.mercurial-scm.org/show_bug.cgi?id=6047 Bug ID: 6047 Summary: Interactive commit does not work as expected with copied files Product: Mercurial Version: 4.8.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: z...@zash.se CC: mercurial-devel@mercurial-scm.org $ seq 1 10 > numbers.txt $ hg add numbers.txt $ hg ci -m whatever $ hg cp numbers.txt more-numbers.txt $ seq 11 20 >> more-numbers.txt $ hg ci -i pick some of the added lines, not all $ hg stat $ hg exp expect: patch with the previously selected lines actual: all the lines were added -- 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
[Bug 6046] New: filesets raise a programming error from the command line with an invalid revision
https://bz.mercurial-scm.org/show_bug.cgi?id=6046
Bug ID: 6046
Summary: filesets raise a programming error from the command
line with an invalid revision
Product: Mercurial
Version: 4.8.1
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: bug
Priority: normal
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: matt_harbi...@yahoo.com
CC: mercurial-devel@mercurial-scm.org
It was a typo on my part walking back from tip, but it's easy to reproduce on
the hg repo:
E:\Projects\hg>.\hg.exe file -r tip~10 "set:size('>=10K')"
** unknown exception encountered, please report by visiting
** https://mercurial-scm.org/wiki/BugTracker
** Python 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:42:59) [MSC v.1500 32
bit (Intel)]
** Mercurial Distributed SCM (version 4.8.1+15-fbd5e2f0bba7)
** Extensions loaded: purge, schemes, strip, mq, blackbox, extdiff, rebase
** ProgrammingError: fileset expression with no context
Traceback (most recent call last):
File "E:\Projects\hg\hg", line 43, in
dispatch.run()
File "E:\Projects\hg\mercurial\dispatch.py", line 96, in run
status = dispatch(req)
File "E:\Projects\hg\mercurial\dispatch.py", line 220, in dispatch
ret = _runcatch(req) or 0
File "E:\Projects\hg\mercurial\dispatch.py", line 363, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "E:\Projects\hg\mercurial\dispatch.py", line 371, in _callcatch
return scmutil.callcatch(ui, func)
File "E:\Projects\hg\mercurial\scmutil.py", line 166, in callcatch
return func()
File "E:\Projects\hg\mercurial\dispatch.py", line 354, in _runcatchfunc
return _dispatch(req)
File "E:\Projects\hg\mercurial\dispatch.py", line 994, in _dispatch
cmdpats, cmdoptions)
File "E:\Projects\hg\mercurial\dispatch.py", line 737, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "E:\Projects\hg\mercurial\dispatch.py", line 1003, in _runcommand
return cmdfunc()
File "E:\Projects\hg\mercurial\dispatch.py", line 991, in
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "E:\Projects\hg\mercurial\util.py", line 1644, in check
return func(*args, **kwargs)
File "E:\Projects\hg\mercurial\util.py", line 1644, in check
return func(*args, **kwargs)
File "E:\Projects\hg\hgext\mq.py", line 3631, in mqcommand
return orig(ui, repo, *args, **kwargs)
File "E:\Projects\hg\mercurial\util.py", line 1644, in check
return func(*args, **kwargs)
File "E:\Projects\hg\mercurial\commands.py", line 2197, in files
m = scmutil.match(ctx, pats, opts)
File "E:\Projects\hg\mercurial\scmutil.py", line 791, in match
return matchandpats(ctx, pats, opts, globbed, default, badfn=badfn)[0]
File "E:\Projects\hg\mercurial\scmutil.py", line 782, in matchandpats
default, listsubrepos=opts.get('subrepos'), badfn=badfn)
File "E:\Projects\hg\mercurial\context.py", line 294, in match
listsubrepos=listsubrepos, badfn=badfn)
File "E:\Projects\hg\mercurial\match.py", line 182, in match
badfn=badfn)
File "E:\Projects\hg\mercurial\match.py", line 103, in _buildkindpatsmatcher
listsubrepos=listsubrepos, badfn=badfn)
File "E:\Projects\hg\mercurial\match.py", line 52, in _expandsets
raise error.ProgrammingError("fileset expression with no "
mercurial.error.ProgrammingError: fileset expression with no context
--
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
[Bug 6045] New: phabsend can leave orphaned children
https://bz.mercurial-scm.org/show_bug.cgi?id=6045 Bug ID: 6045 Summary: phabsend can leave orphaned children Product: Mercurial Version: 4.8.1 Hardware: All OS: All Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: matt_harbi...@yahoo.com CC: mercurial-devel@mercurial-scm.org It's a corner case, and I'm not sure if there's a lot of value to submitting non-contiguous commits (maybe to skip a large binary artifact?). In any event, this simple graph... @ changeset: 48128:d6805464fb32 | tag: tip | user:Matt Harbison | date:Sun Dec 30 22:46:54 2018 -0500 | summary: exthelper: switch to using the registrar merging method | o changeset: 48127:94d4ffb62049 | parent: 48125:a567c612e909 | user:Matt Harbison | date:Sun Dec 30 21:52:26 2018 -0500 | summary: registrar: add a method to merge registrar instances | o changeset: 48125:a567c612e909 | parent: 48123:88d813cd9acd | user:Matt Harbison | date:Sat Dec 29 01:51:02 2018 -0500 | summary: phabricator: ensure that the return of urlopener.open() is closed | o changeset: 48123:88d813cd9acd | bookmark:@ ~ user:Boris Feld date:Thu Dec 20 09:59:16 2018 +0100 summary: revlog: fix pure python slicing test when chain contains nullrev ... becomes this: @ changeset: 48130:6b6598c10048 | tag: tip | parent: 48127:94d4ffb62049 | user:Matt Harbison | date:Sun Dec 30 22:46:54 2018 -0500 | instability: orphan | summary: exthelper: switch to using the registrar merging method | | o changeset: 48129:85ed6e9bdd42 | | parent: 48123:88d813cd9acd | | user:Matt Harbison | | date:Sat Dec 29 01:51:02 2018 -0500 | | summary: phabricator: ensure that the return of urlopener.open() is closed | | * | changeset: 48127:94d4ffb62049 | | parent: 48125:a567c612e909 | | user:Matt Harbison | | date:Sun Dec 30 21:52:26 2018 -0500 | | instability: orphan | | summary: registrar: add a method to merge registrar instances | | x | changeset: 48125:a567c612e909 |/ parent: 48123:88d813cd9acd |user:Matt Harbison |date:Sat Dec 29 01:51:02 2018 -0500 |obsolete:reworded using phabsend as 48129:85ed6e9bdd42 |summary: phabricator: ensure that the return of urlopener.open() is closed | o changeset: 48123:88d813cd9acd | bookmark:@ | user:Boris Feld | date:Thu Dec 20 09:59:16 2018 +0100 | summary: revlog: fix pure python slicing test when chain contains nullrev when submitting 48125+48128. I was going to suggest disallowing gaps if we don't want to handle this case, but it looks like a similar result occurs when running phabsend on any non head. Since the stack would auto-stabilize if the selection is contiguous, I'm not sure if the feature should be to always auto-stabilize the range (or maybe start to head?) in phabricator, or if this is an evolve feature. (Think auto rewrite the stack after meta-editing a commit message several commits deep.) -- 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
[Bug 6044] New: ProgrammingError with empty revspec
https://bz.mercurial-scm.org/show_bug.cgi?id=6044 Bug ID: 6044 Summary: ProgrammingError with empty revspec Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: damien...@gmx.fr CC: mercurial-devel@mercurial-scm.org $ hg up "" ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.15 (default, Jun 27 2018, 13:05:28) [GCC 8.1.1 20180531] ** Mercurial version 4.8.1, système de gestion de sources distribué ** Extensions chargées : ** ProgrammingError: unsupported changeid '' of type Traceback (most recent call last): File "/usr/bin/hg", line 43, in dispatch.run() File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 96, in run status = dispatch(req) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 220, in dispatch ret = _runcatch(req) or 0 File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 363, in _runcatch return _callcatch(ui, _runcatchfunc) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 371, in _callcatch return scmutil.callcatch(ui, func) File "/usr/lib/python2.7/site-packages/mercurial/scmutil.py", line 166, in callcatch return func() File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 354, in _runcatchfunc return _dispatch(req) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 994, in _dispatch cmdpats, cmdoptions) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 737, in runcommand ret = _runcommand(ui, options, cmd, d) File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 1003, in _runcommand return cmdfunc() File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 991, in d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1644, in check return func(*args, **kwargs) File "/usr/lib/python2.7/site-packages/mercurial/commands.py", line 6041, in update ctx = scmutil.revsingle(repo, rev, rev) File "/usr/lib/python2.7/site-packages/mercurial/scmutil.py", line 659, in revsingle return repo[default] File "/usr/lib/python2.7/site-packages/mercurial/localrepo.py", line 1277, in __getitem__ (changeid, type(changeid))) mercurial.error.ProgrammingError: unsupported changeid '' of type $ -- 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
[Bug 6043] New: hg push/incoming/etc. results in Exception AttributeError
https://bz.mercurial-scm.org/show_bug.cgi?id=6043 Bug ID: 6043 Summary: hg push/incoming/etc. results in Exception AttributeError Product: Mercurial Version: 4.7.2 Hardware: Macintosh OS: Mac OS Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: ludo.vis...@gmail.com CC: mercurial-devel@mercurial-scm.org Issuing a command to interact with a remote repository (e.g. BitBucket) gives a Exception: $ hg incoming comparing with https://my/remote/repo searching for changes no changes found Exception AttributeError: "'NoneType' object has no attribute 'close'" in > ignored The command seems to complete though. No other output is given, making it a bit difficult to debug. version: 4.7.2 (from MacPorts) enabled extensions: mercurial_keyring -- 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
[Bug 6042] New: commit --interactive surprising behavior when .hgrc includes [diff] ignorews=True
https://bz.mercurial-scm.org/show_bug.cgi?id=6042 Bug ID: 6042 Summary: commit --interactive surprising behavior when .hgrc includes [diff] ignorews=True Product: Mercurial Version: earlier Hardware: All OS: Mac OS Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: schn...@gmail.com CC: mercurial-devel@mercurial-scm.org With this .hgrc: [ui] username=Robert Tupelo-Schneck [diff] ignorews=True I find that hg commit --interactive behaves surprisingly. It does not see changes to whitespace. As a result even when I ask the interactive commit process to commit all changes to a file (or all files) it leaves whitespace changes uncommitted. -- 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
[Bug 6041] New: pull and incoming can get confused by an obsolete tip
https://bz.mercurial-scm.org/show_bug.cgi?id=6041 Bug ID: 6041 Summary: pull and incoming can get confused by an obsolete tip Product: Mercurial Version: 4.8.1 Hardware: All OS: All Status: UNCONFIRMED Severity: bug Priority: normal Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: matt_harbi...@yahoo.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org On Windows 7, I've got this repo being served up: @ 48064[tip] 4ca7129e5c1f 2018-12-23 23:01 -0500 matt_harbison |largefiles: drop the uisetup module | o 48063:48059 05fbe3a458be 2018-12-23 22:57 -0500 matt_harbison |largefiles: port wrapped functions to exthelper | o 48059 32aa43e03857 2018-12-23 17:26 -0500 matt_harbison |largefiles: port commands to exthelper | o 48058:48051 a341e513e16c 2018-12-23 21:54 -0500 matt_harbison |exthelper: support the option argument when registering a command | o 48051:48049 be536e648c4f 2018-12-23 16:16 -0500 matt_harbison |largefiles: port configitems to exthelper ~ I cloned to a Windows 10 system, and amended 4ca7129e5c1f: $ hg log --hidden -l 6 -G @ changeset: 41205:6a6b8808738b | tag: tip | parent: 41203:05fbe3a458be | user:Matt Harbison | date:Sun Dec 23 23:01:51 2018 -0500 | summary: largefiles: drop the uisetup module | | x changeset: 41204:4ca7129e5c1f |/ user:Matt Harbison |date:Sun Dec 23 23:01:51 2018 -0500 |obsolete:amended using amend as 41205:6a6b8808738b |summary: largefiles: drop the uisetup module | o changeset: 41203:05fbe3a458be | parent: 41200:32aa43e03857 | user:Matt Harbison | date:Sun Dec 23 22:57:03 2018 -0500 | summary: largefiles: port wrapped functions to exthelper | | x changeset: 41202:3feac485cd01 | | user:Matt Harbison | | date:Sun Dec 23 23:01:51 2018 -0500 | | obsolete:rebased using evolve as 41204:4ca7129e5c1f | | summary: largefiles: drop the uisetup module | | | x changeset: 41201:12bf136efab3 |/ user:Matt Harbison |date:Sun Dec 23 22:57:03 2018 -0500 |obsolete:amended using amend as 41203:05fbe3a458be |summary: largefiles: port wrapped functions to exthelper | o changeset: 41200:32aa43e03857 | user:Matt Harbison ~ date:Sun Dec 23 17:26:25 2018 -0500 summary: largefiles: port commands to exthelper However, `hg pull` thinks that the amended commit is incoming: $ hg in default-push -r tip comparing with http://envy:8000/ searching for changes changeset: 41204:4ca7129e5c1f user:Matt Harbison date:Sun Dec 23 23:01:51 2018 -0500 obsolete:amended using amend as 41205:6a6b8808738b summary: largefiles: drop the uisetup module ... and pull aborts: $ hg pull default-push -r tip --traceback pulling from http://envy:8000/ searching for changes no changes found Traceback (most recent call last): File "mercurial\scmutil.pyo", line 166, in callcatch File "mercurial\dispatch.pyo", line 354, in _runcatchfunc File "mercurial\dispatch.pyo", line 994, in _dispatch File "mercurial\dispatch.pyo", line 737, in runcommand File "mercurial\dispatch.pyo", line 1003, in _runcommand File "mercurial\dispatch.pyo", line 991, in File "mercurial\util.pyo", line 1644, in check File "mercurial\util.pyo", line 1644, in check File "hgext\rebase.pyo", line 1861, in pullrebase File "mercurial\util.pyo", line 1644, in check File "mercurial\util.pyo", line 1644, in check File "hgext3rd\evolve\__init__.pyo", line 797, in warnobserrors File "mercurial\util.pyo", line 1644, in check File "mercurial\util.pyo", line 1644, in check File "hgext3rd\evolve\__init__.pyo", line 773, in wrapmayobsoletewc File "mercurial\util.pyo", line 1644, in check File "mercurial\commands.pyo", line 4420, in pull File "mercurial\changelog.pyo", line 371, in rev FilteredLookupError: 00changelog.i@4ca7129e5c1f35c08923acf7d7583a4f26033d39: filtered node abort: 00changelog.i@4ca7129e5c1f35c08923acf7d7583a4f26033d39: filtered node! I suspect the problem here is specifying -r, which I'm only doing to avoid bringing over a bunch of other junk. -- 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
[Bug 6040] New: phabsend UnicodeEncodeError on commit which uses accents
https://bz.mercurial-scm.org/show_bug.cgi?id=6040 Bug ID: 6040 Summary: phabsend UnicodeEncodeError on commit which uses accents Product: Mercurial Version: 4.8.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: third-party Assignee: bugzi...@mercurial-scm.org Reporter: arthur.l...@logilab.fr CC: mercurial-devel@mercurial-scm.org On a commit which contains a "é" character in the commit message I get : ``` $ hg phabsend -r . NEW - 44aa0f4e0013: XXX ajouté Send the above changes to https://phab.example.org (yn)? y ** Unknown exception encountered with possibly-broken third-party extension thg ** which supports versions 4.3 of Mercurial. ** Please disable thg and try your action again. ** If that fixes the bug please report it to the extension author. ** Python 2.7.15rc1 (default, Nov 12 2018, 14:31:15) [GCC 7.3.0] ** Mercurial Distributed SCM (version 4.8) ** Extensions loaded: strip, pager, evolve, topic, rebase, record, histedit, purge, hggit, thg, patchbomb, phabricator Traceback (most recent call last): File "/usr/bin/hg", line 43, in dispatch.run() File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 96, in run status = dispatch(req) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 220, in dispatch ret = _runcatch(req) or 0 File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 363, in _runcatch return _callcatch(ui, _runcatchfunc) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 371, in _callcatch return scmutil.callcatch(ui, func) File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 166, in callcatch return func() File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 354, in _runcatchfunc return _dispatch(req) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 994, in _dispatch cmdpats, cmdoptions) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 737, in runcommand ret = _runcommand(ui, options, cmd, d) File "/usr/lib/python2.7/dist-packages/hgext/pager.py", line 77, in pagecmd return orig(ui, options, cmd, cmdfunc) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 1003, in _runcommand return cmdfunc() File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 991, in d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1646, in check return func(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/hgext/phabricator.py", line 143, in inner return fn(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/hgext/phabricator.py", line 532, in phabsend ctx, revid, lastrevid, oldnode, olddiff, actions) File "/usr/lib/python2.7/dist-packages/hgext/phabricator.py", line 440, in createdifferentialrevision revision = callconduit(repo, b'differential.revision.edit', params) File "/usr/lib/python2.7/dist-packages/hgext/phabricator.py", line 203, in callconduit data = urlencodenested(params) File "/usr/lib/python2.7/dist-packages/hgext/phabricator.py", line 167, in urlencodenested return util.urlreq.urlencode(flatparams) File "/usr/lib/python2.7/urllib.py", line 1342, in urlencode v = quote_plus(str(v)) UnicodeEncodeError: 'ascii' codec can't encode character u'\xe9' in position 29: ordinal not in range(128) ``` (sorry couldn't find a phabricator component, so using third-party for now) -- 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
[Bug 6039] New: The experimental evolution configs can silently prevent evolve from fully initializing
https://bz.mercurial-scm.org/show_bug.cgi?id=6039 Bug ID: 6039 Summary: The experimental evolution configs can silently prevent evolve from fully initializing Product: Mercurial Version: 4.8.1 Hardware: All OS: All Status: UNCONFIRMED Severity: bug Priority: normal Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: matt_harbi...@yahoo.com CC: lothiral...@gmail.com, mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org This is reproducible with both 4.6.1 (in the thg install), and 4.8.1 with evolve loaded from a repository. It feels a lot like issue5815, but I haven't been able to confirm it yet. A coworker had the following in Mercurial.ini, to support phabricator (without evolve): [experimental] evolution = createmarkers, allowunstable But on the command line when I was showing him how evolve worked: $ /d/mercurial/hg evolve hg: unknown command 'evolve' (did you mean one of recover, remove, resolve, shelve?) However, the help for the extension *is* loaded (i.e. `hg help evolve` prints extension help, not the evolve command level help as expected). Further, pstatus and pdiff show up in the help, and can be run. When using the modern syntax, it seems to work: [experimental] evolution.createmarkers = true evolution.allowunstable = true So it's not a big deal, but it was tough to recognize what was happening and root cause it. Maybe there's something that needs to be fixed in config parsing and/or the extension loading sequence. -- 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
[Bug 6038] New: log + diffstat is really slow with big changes
https://bz.mercurial-scm.org/show_bug.cgi?id=6038 Bug ID: 6038 Summary: log + diffstat is really slow with big changes Product: Mercurial Version: unspecified Hardware: PC OS: All Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: i...@juanfra.info CC: mercurial-devel@mercurial-scm.org I usually use a template to create a nicer log output. The command includes "--stat" and it is really slow in some of my repos. Try this example: $ hg clone https://bitbucket.org/juanfra684/test-hg-xenocara $ hg log --stat --pager never The command will get stuck for a few seconds in some revisions. It's very annoying for me. I guess that you're generating the diffstat info on the fly. So, I'm asking to change the dynamic diffstat to a pregenerated diffstat info in the default storage format and if this is not possible, at least for future backends like the sqlitestorage. -- 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
[Bug 6037] New: `hg grab` loses added files when there are merge conflicts
https://bz.mercurial-scm.org/show_bug.cgi?id=6037 Bug ID: 6037 Summary: `hg grab` loses added files when there are merge conflicts Product: Mercurial Version: unspecified Hardware: PC OS: Mac OS Status: UNCONFIRMED Severity: feature Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: jandemo...@gmail.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org I like the `grab` command a lot, but sometimes it removes added files when there are merge conflicts. I can reproduce with the comamnds below in an empty directory. test2.txt is an untracked file at the end. hg init . echo "foo" > test.txt hg add test.txt hg commit -m "Add file" echo "bar" > test2.txt hg add test2.txt echo "foo1" > test.txt hg commit -m "Change test.txt, add test2.txt" echo "foo2" > test.txt hg commit -m "Change test.txt" hg up -r 0 hg grab -r 2 hg resolve -t internal:other --all hg grab --continue hg grab -r 1 hg resolve -t internal:other --all hg grab --continue hg status -- 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
[Bug 6036] New: `hg update` can take too much of memory on large repos
https://bz.mercurial-scm.org/show_bug.cgi?id=6036 Bug ID: 6036 Summary: `hg update` can take too much of memory on large repos Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org There have been good amount of instances internally that `hg update` takes a lot of memory and aborts saying "abort: Cannot allocate memory". Following are things which I have noticed: 1) updating from tip to 0 revision or vice versa can take upto 1 GB of memory on Mozilla repo 2) Internally updating from 0 to tip is taking 7-8 GB of memory. There are internal reports about `hg update` taking 20GB's of memory too. I agree we have a large repo but update should still work better. We generally update from rev 0 to tip after clone and that's where we are hitting this problem mostly. -- 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
[Bug 6035] New: hg update exit with 255, dirstate corrupted
https://bz.mercurial-scm.org/show_bug.cgi?id=6035
Bug ID: 6035
Summary: hg update exit with 255, dirstate corrupted
Product: Mercurial
Version: 4.8
Hardware: PC
OS: Other
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: sema...@online.fr
CC: mercurial-devel@mercurial-scm.org
Created attachment 2026
--> https://bz.mercurial-scm.org/attachment.cgi?id=2026=edit
test6.sh
I am on OpenBSD -current (development head, upcoming 6.5), using mercurial
4.8.1 installed from OpenBSD package system (using `pkg_add mercurial`).
I am facing a problem with `hg update`, where the command ends with exit code
255, and a corrupted dirstate. I am able to reproduce it on OpenBSD on
different hosts, with a newly created hg repository made from scratch.
It seems mercurial is confused by the present of some CVS/ directory in the
repository.
In order to reproduce, I am using the attached `test6.sh` script.
It checkouts from an OpenBSD mirror a part of the ports tree (the commented
curl command is an alternative to download the content for testing on
environment without cvs), create a new mercurial repository, and next clone it.
I splited the clone operation in "clone --noupdate" (works well) and the
"update" operation (failed).
Note that if I remove the CVS/ directories before creating the repository
(commented find command), the operation succeeded.
The traceback generated (with --traceback) of `hg update` is the following:
```
Traceback (most recent call last):
File "/usr/local/lib/python2.7/site-packages/mercurial/scmutil.py", line 166,
in callcatch
return func()
File "/usr/local/lib/python2.7/site-packages/mercurial/worker.py", line 187,
in workerfunc
for result in func(*(staticargs + (pargs,))):
File "/usr/local/lib/python2.7/site-packages/mercurial/merge.py", line 1492,
in batchget
repo.ui.note(_("getting %s\n") % f)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 1463, in
note
self.write(*msg, **opts)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 950, in
write
self._writenobuf(*args, **opts)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 962, in
_writenobuf
self._write(*msgs, **opts)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 969, in
_write
self.fout.write(''.join(msgs))
File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
260, in catchterm
raise error.SignalInterrupt
SignTraceback (most recent call last):
File "/usr/local/lib/python2.7/site-packages/mercurial/scmutil.py", line 166,
in callcatch
return func()
File "/usr/local/lib/python2.7/site-packages/mercurial/worker.py", line 187,
in workerfunc
for result in func(*(staticargs + (pargs,))):
File "/usr/local/lib/python2.7/site-packages/mercurial/merge.py", line 1492,
in batchget
repo.ui.note(_("getting %s\n") % f)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 1463, in
note
self.write(*msg, **opts)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 950, in
write
self._writenobuf(*args, **opts)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 962, in
_writenobuf
self._write(*msgs, **opts)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 969, in
_write
self.fout.write(''.join(msgs))
File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
260, in catchterm
raise error.SignalInterrupt
SignalInterrupt
alInterrupt
Traceback (most recent call last):
File "/usr/local/lib/python2.7/site-packages/mercurial/worker.py", line 191,
in _posixworker
ret = scmutil.callcatch(ui, workerfunc)
File "/usr/local/lib/python2.7/site-packages/mercurial/scmutil.py", line 166,
in callcatch
return func()
File "/usr/local/lib/python2.7/site-packages/mercurial/worker.py", line 187,
in workerfunc
for result in func(*(staticargs + (pargs,))):
File "/usr/local/lib/python2.7/site-packages/mercurial/merge.py", line 1492,
in batchget
repo.ui.note(_("getting %s\n") % f)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 1463, in
note
self.write(*msg, **opts)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 950, in
write
self._writenobuf(*args, **opts)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 962, in
_writenobuf
self._write(*msgs, **opts)
File "/usr/local/lib/python2.7/site-packages/mercurial/ui.py", line 969, in
_write
self.fout.write(''.join(msgs))
File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
260, in catchterm
raise error.SignalInterrupt
SignalInterrupt
Traceback (most recent call last):
File
[Bug 6034] New: Provide better way to recover from a broken repository.
https://bz.mercurial-scm.org/show_bug.cgi?id=6034 Bug ID: 6034 Summary: Provide better way to recover from a broken repository. Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org Sometimes users break their repositories due to some power failures or some other reasons and end up in a broken repository. The way we suggest the fix right now is `hg clone -r `. This has come up on IRC few times in last few weeks. I think it's worthwhile to provide users some functionality where they can fix such cases. -- 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
[Bug 6033] New: Weird lfs test failure: reliable on FreeBSD, flaky on linux
https://bz.mercurial-scm.org/show_bug.cgi?id=6033
Bug ID: 6033
Summary: Weird lfs test failure: reliable on FreeBSD, flaky on
linux
Product: Mercurial
Version: stable branch
Hardware: PC
OS: Mac OS
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: lfs
Assignee: bugzi...@mercurial-scm.org
Reporter: duri...@gmail.com
CC: mercurial-devel@mercurial-scm.org
I can't make sense of this failure, but it's keeping the BSD buildbot from
being green, and it occasionally shows up on Linux too.
---
/usr/home/hg/buildslave/FreeBSD_hg_tests/build/tests/test-lfs-serve-access.t
+++
/usr/home/hg/buildslave/FreeBSD_hg_tests/build/tests/test-lfs-serve-access.t.err
@@ -161,11 +161,13 @@
$ cat $TESTTMP/access.log $TESTTMP/errors.log
$LOCALIP - - [$LOGDATE$] "POST /missing/objects/batch HTTP/1.1" 404 - (glob)
+ 172.16.18.2 - - [05/Dec/2018 13:01:14] "{"objects": [{"oid":
"f03217a32529a28a42d03b1244fe09b6e0f9fd06d7b966d4d50567be2abe6c0e", "size":
20}], "operation": "download"}" 400 -
$LOCALIP - - [$LOGDATE$] "GET /subdir/mount/point?cmd=capabilities HTTP/1.1"
200 - (glob)
$LOCALIP - - [$LOGDATE$] "GET /subdir/mount/point?cmd=batch HTTP/1.1" 200 -
x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2
comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
$LOCALIP - - [$LOGDATE$] "GET /subdir/mount/point?cmd=getbundle HTTP/1.1"
200 -
x-hgarg-1:bookmarks=1=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%252C03%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps%250Arev-branch-cache%250Astream%253Dv2=1==525251863cad618e55d483555f3d00a2ca99597e=bookmarks=1
x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
$LOCALIP - - [$LOGDATE$] "POST
/subdir/mount/point/.git/info/lfs/objects/batch HTTP/1.1" 200 - (glob)
$LOCALIP - - [$LOGDATE$] "GET
/subdir/mount/point/.hg/lfs/objects/f03217a32529a28a42d03b1244fe09b6e0f9fd06d7b966d4d50567be2abe6c0e
HTTP/1.1" 200 - (glob)
+ 172.16.18.2 - - [05/Dec/2018 13:01:14] code 400, message Bad request syntax
('{"objects": [{"oid":
"f03217a32529a28a42d03b1244fe09b6e0f9fd06d7b966d4d50567be2abe6c0e", "size":
20}], "operation": "download"}')
Blobs that already exist in the usercache are linked into the repo store, even
though the client doesn't send the blob.
@@ -193,6 +195,7 @@
server2/.hg/store/lfs/objects/f0/3217a32529a28a42d03b1244fe09b6e0f9fd06d7b966d4d50567be2abe6c0e
$ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
$ cat $TESTTMP/errors.log
+ 172.16.18.2 - - [05/Dec/2018 13:01:14] code 400, message Bad request syntax
('{"objects": [{"oid":
"f03217a32529a28a42d03b1244fe09b6e0f9fd06d7b966d4d50567be2abe6c0e", "size":
20}], "operation": "download"}')
$ cat >> $TESTTMP/lfsstoreerror.py < import errno
ERROR: test-lfs-serve-access.t output changed
--
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
[Bug 6032] New: Mercurial PPA is not updated from long time
https://bz.mercurial-scm.org/show_bug.cgi?id=6032 Bug ID: 6032 Summary: Mercurial PPA is not updated from long time Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: packaging Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: duri...@gmail.com, mercurial-devel@mercurial-scm.org PPA's are source of latest mercurial for a lot of people. The mercurial PPA (managed by smf) is not updated from long time. We are failing to ship the improvements and new features. Let's fix this somehow. PS: I don't know much about PPA's and how many PPAs we have. Link to one of such cases when people are asking about PPA: https://twitter.com/duncanfairley/status/984838818925756417 -- 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
[Bug 6031] New: test-encoding-align test failure
https://bz.mercurial-scm.org/show_bug.cgi?id=6031 Bug ID: 6031 Summary: test-encoding-align test failure Product: Mercurial Version: 4.8 Hardware: All OS: NetBSD Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: t...@giga.or.at CC: mercurial-devel@mercurial-scm.org Mercurial 4.8 fails the test-encoding-align self test on NetBSD-8.99.26. The output is: --- /scratch/devel/py-mercurial/work/mercurial-4.8/tests/test-encoding-align.t +++ /scratch/devel/py-mercurial/work/mercurial-4.8/tests/test-encoding-align.t.err @@ -94,20 +94,23 @@ $ echo 'third line(2)' >> m; cp m $M $ echo 'third line(3)' >> l; cp l $L $ hg commit -m 'third commit' -u $L + transaction abort! + rollback completed + abort: decoding near '\xe9\x95\xb7\xe3\x84\xe9\x95\xb7\xe3\x84\xe5\x90\x8d': 'utf8' codec can't decode bytes in position 3-4: invalid continuation byte! (esc) + [255] check alignment of user names in annotate $ hg annotate -u $M - \xe7\x9f\xad\xe5\x90\x8d: first line(2) (esc) - MIDDLE_: second line(2) - \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d: third line(2) (esc) + \xe7\x9f\xad\xe5\x90\x8d: first line(2) (esc) + MIDDLE_: second line(2) check alignment of filenames in diffstat $ hg diff -c tip --stat - MIDDLE_ | 1 + - \xe7\x9f\xad\xe5\x90\x8d | 1 + (esc) - \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d | 1 + (esc) + MIDDLE_| 1 + + \xe7\x9f\xad\xe5\x90\x8d | 1 + (esc) + \xe9\x95\xb7\xe3\x84\xe9\x95\xb7\xe3\x84\xe5\x90\x8d\xe5\x89\x8d | 1 + (esc) 3 files changed, 3 insertions(+), 0 deletions(-) add branches/tags @@ -122,29 +125,31 @@ $ hg tag $M $ hg book -f $M $ hg branch $L - marked working directory as branch \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) + abort: decoding near '\xe9\x95\xb7\xe3\x84\xe9\x95\xb7\xe3\x84\xe5\x90\x8d': 'utf8' codec can't decode bytes in position 3-4: invalid continuation byte! (esc) + [255] $ hg tag $L + abort: decoding near '\xe9\x95\xb7\xe3\x84\xe9\x95\xb7\xe3\x84\xe5\x90\x8d': 'utf8' codec can't decode bytes in position 3-4: invalid continuation byte! (esc) + [255] $ hg book -f $L + abort: decoding near '\xe9\x95\xb7\xe3\x84\xe9\x95\xb7\xe3\x84\xe5\x90\x8d': 'utf8' codec can't decode bytes in position 3-4: invalid continuation byte! (esc) + [255] check alignment of branches $ hg branches - \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc) - MIDDLE_4:9259be597f19 (inactive) - \xe7\x9f\xad\xe5\x90\x8d 3:b06c5b6def9e (inactive) (esc) - default2:64a70663cee8 (inactive) + MIDDLE_3:3d4ab5fdb5f3 + \xe7\x9f\xad\xe5\x90\x8d 2:bb31cecde4aa (inactive) (esc) + default1:af9e815feb02 (inactive) check alignment of tags $ hg tags - tip5:d745ff46155b - \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 4:9259be597f19 (esc) - MIDDLE_3:b06c5b6def9e - \xe7\x9f\xad\xe5\x90\x8d 2:64a70663cee8 (esc) + tip3:3d4ab5fdb5f3 + MIDDLE_2:bb31cecde4aa + \xe7\x9f\xad\xe5\x90\x8d 1:af9e815feb02 (esc) check alignment of bookmarks $ hg book - MIDDLE_ 5:d745ff46155b - \xe7\x9f\xad\xe5\x90\x8d 4:9259be597f19 (esc) - * \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc) + MIDDLE_ 3:3d4ab5fdb5f3 + \xe7\x9f\xad\xe5\x90\x8d 3:3d4ab5fdb5f3 (esc) ERROR: test-encoding-align.t output changed -- 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
[Bug 6030] New: test-https test failure
https://bz.mercurial-scm.org/show_bug.cgi?id=6030 Bug ID: 6030 Summary: test-https test failure Product: Mercurial Version: 4.8 Hardware: All OS: NetBSD Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: t...@giga.or.at CC: mercurial-devel@mercurial-scm.org mercurial-4.8 fails the test-https test on NetBSD-8.99.26/amd64. The output is: --- /scratch/devel/py-mercurial/work/mercurial-4.8/tests/test-https.t +++ /scratch/devel/py-mercurial/work/mercurial-4.8/tests/test-https.t.err @@ -355,15 +355,11 @@ Setting ciphers to an invalid value aborts $ P="$CERTSDIR" hg --config hostsecurity.ciphers=invalid -R copy-pull id https://localhost:$HGPORT/ warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?) - abort: could not set ciphers: No cipher can be selected. - (change cipher string (invalid) in config) - [255] + 5fed3813f7f5 $ P="$CERTSDIR" hg --config hostsecurity.localhost:ciphers=invalid -R copy-pull id https://localhost:$HGPORT/ warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?) - abort: could not set ciphers: No cipher can be selected. - (change cipher string (invalid) in config) - [255] + 5fed3813f7f5 Changing the cipher string works @@ -624,7 +620,7 @@ $ P="$CERTSDIR" hg id https://localhost:$HGPORT/ warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?) - abort: error: *handshake failure* (glob) + abort: error: [SSL] tlsv13 alert certificate required (_ssl.c:1941) [255] with client certificate: ERROR: test-https.t output changed In case it matters, this version of NetBSD uses openssl v1.1. -- 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
[Bug 6029] New: lfconvert --to-normal fails
https://bz.mercurial-scm.org/show_bug.cgi?id=6029 Bug ID: 6029 Summary: lfconvert --to-normal fails Product: Mercurial Version: 4.7 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Priority: wish Component: largefiles Assignee: bugzi...@mercurial-scm.org Reporter: vost...@gmail.com CC: mercurial-devel@mercurial-scm.org, nato...@gmail.com I am trying to remove largefiles from a repo. I have recloned the repository using --all-largefiles to make sure I'm starting with a complete local copy. After about 180 changes processed mercurial fails: (last commit message before failure) 4812 remove that commode for real? ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)] ** Mercurial Distributed SCM (version 4.7+11-cee9043c7dba) ** Extensions loaded: eol, largefiles Traceback (most recent call last): File "hg", line 50, in File "mercurial\dispatch.pyo", line 90, in run File "mercurial\dispatch.pyo", line 213, in dispatch File "mercurial\dispatch.pyo", line 354, in _runcatch File "mercurial\dispatch.pyo", line 362, in _callcatch File "mercurial\scmutil.pyo", line 161, in callcatch File "mercurial\dispatch.pyo", line 344, in _runcatchfunc File "mercurial\dispatch.pyo", line 984, in _dispatch File "mercurial\dispatch.pyo", line 730, in runcommand File "mercurial\dispatch.pyo", line 992, in _runcommand File "mercurial\dispatch.pyo", line 981, in File "mercurial\util.pyo", line 1528, in check File "hgext\largefiles\lfcommands.pyo", line 184, in lfconvert File "hgext\convert\convcmd.pyo", line 616, in convert File "hgext\convert\convcmd.pyo", line 525, in convert File "hgext\convert\convcmd.pyo", line 492, in copy File "hgext\convert\hg.pyo", line 346, in putcommit File "hgext\eol.pyo", line 404, in commitctx File "mercurial\context.pyo", line 1186, in added File "mercurial\util.pyo", line 1412, in __get__ File "mercurial\context.pyo", line 2298, in _status File "mercurial\context.pyo", line 174, in manifest File "mercurial\util.pyo", line 1412, in __get__ File "mercurial\context.pyo", line 469, in _manifest File "mercurial\manifest.pyo", line 1427, in read File "mercurial\manifest.pyo", line 373, in __init__ File "mercurial\manifest.pyo", line 126, in __init__ File "mercurial\manifest.pyo", line 148, in findlines ValueError: Manifest lines not in sorted order. There are no other extensions in this repository. hg verify reported no errors: checking changesets checking manifests crosschecking files in changesets and manifests checking files 66985 files, 4969 changesets, 92807 total revisions -- 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
[Bug 6028] New: evolve fails with mercurial.error.ProgrammingError: unsupported changeid '' of type
https://bz.mercurial-scm.org/show_bug.cgi?id=6028
Bug ID: 6028
Summary: evolve fails with mercurial.error.ProgrammingError:
unsupported changeid '' of type
Product: Mercurial
Version: 4.8
Hardware: Macintosh
OS: Mac OS
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: t...@tomchuk.com
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
Steps to reproduce:
uname -srvmpio
Darwin 18.2.0 Darwin Kernel Version 18.2.0: Mon Nov 12 20:24:31 PST 2018;
root:xnu-4903.231.4~1/RELEASE_X86_64 x86_64 i386 MacBookPro15,1 Darwin
hg --version
Mercurial Distributed SCM (version 4.8)
(see https://mercurial-scm.org for more information)
Copyright (C) 2005-2018 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
pip freeze | grep evolve
hg-evolve==8.3.2
hg up default
hg topics XXX
hg commit -m '...'
hg push -t XXX
hg up int
hg merge XXX
hg commit -m '...'
hg push -b int
# Other users of the repo merge to int in the meantime...
# It's decided to discard work on topic XXX and remove it from int
hg up XXX
hg prune -r t1
hg up int
hg prune -r s61 # Merge of XXX
hg up -r 'branch("int") and not troubled()'
hg stack
### target: int (branch)
s64$ merge YYY-4420 (unstable)
^ YYY-4420 Bug fix
s63^ merge (base unstable)
s63$ merge (unstable)
s61^ merge YYY-7421 into int (base current)
s62^ merge YYY-4420 to int (base unstable)
s62$ merge YYY-4420 to int (unstable)
^ YYY-4420 Fix broken tests, and malformatted score-function queries
s60^ merge YYY-7420 into int (base)
s61@ merge YYY-7421 into int (current)
^ YYY-7421 - remove old templates
s60^ merge YYY-7420 into int (base)
s60: merge YYY-7420 into int
^ YYY-7420 - clean up legacy files
s59^ int merge with YYY-3588 (base)
s59: int merge with YYY-3588
^ YYY-3588 fixes and changes from PR comments
s58^ merge YYY-4420 to int (base)
hg evolve --all
cannot solve instability of aaf846c182b1, skipping
** Unknown exception encountered with possibly-broken third-party extension
evolve
** which supports versions 4.7 of Mercurial.
** Please disable evolve and try your action again.
** If that fixes the bug please report it to https://bz.mercurial-scm.org/
** Python 2.7.15 (default, Jul 16 2018, 20:11:40) [GCC 4.2.1 Compatible Apple
LLVM 10.0.0 (clang-1000.10.38)]
** Mercurial Distributed SCM (version 4.8)
** Extensions loaded: extdiff, strip, mq, histedit, rebase, evolve, topic,
record, fsmonitor, journal, shelve
** ProgrammingError: unsupported changeid '' of type
Traceback (most recent call last):
File "/usr/local/bin/hg", line 43, in
dispatch.run()
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/dispatch.py",
line 96, in run
status = dispatch(req)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/dispatch.py",
line 220, in dispatch
ret = _runcatch(req) or 0
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/dispatch.py",
line 363, in _runcatch
return _callcatch(ui, _runcatchfunc)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/dispatch.py",
line 371, in _callcatch
return scmutil.callcatch(ui, func)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/scmutil.py",
line 166, in callcatch
return func()
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/dispatch.py",
line 354, in _runcatchfunc
return _dispatch(req)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/dispatch.py",
line 994, in _dispatch
cmdpats, cmdoptions)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/hgext/journal.py",
line 90, in runcommand
return orig(lui, repo, cmd, fullargs, *args)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/dispatch.py",
line 737, in runcommand
ret = _runcommand(ui, options, cmd, d)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/dispatch.py",
line 1003, in _runcommand
return cmdfunc()
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/dispatch.py",
line 991, in
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/util.py",
line 1644, in check
return func(*args, **kwargs)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/mercurial/util.py",
line 1644, in check
return func(*args, **kwargs)
File
"/usr/local/Cellar/mercurial/4.8/lib/python2.7/site-packages/hgext/mq.py", line
3631, in mqcommand
return orig(ui, repo, *args, **kwargs)
[Bug 6027] New: Links traversal check outside repo
https://bz.mercurial-scm.org/show_bug.cgi?id=6027
Bug ID: 6027
Summary: Links traversal check outside repo
Product: Mercurial
Version: 4.8
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: damien...@gmx.fr
CC: mercurial-devel@mercurial-scm.org
Hello
I get a error when I run a command like this
```
$ hg --traceback rebase -n -b revset -d @
starting dry-run rebase; repository will not be changed
rebasing 804:1704993a3282 "next"
Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/mercurial/scmutil.py", line 166, in
callcatch
return func()
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 354, in
_runcatchfunc
return _dispatch(req)
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 994, in
_dispatch
cmdpats, cmdoptions)
File "/usr/lib/python2.7/site-packages/hgext/journal.py", line 90, in
runcommand
return orig(lui, repo, cmd, fullargs, *args)
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 737, in
runcommand
ret = _runcommand(ui, options, cmd, d)
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 1003, in
_runcommand
return cmdfunc()
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 991, in
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1644, in
check
return func(*args, **kwargs)
File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1644, in
check
return func(*args, **kwargs)
File "/usr/lib/python2.7/site-packages/hgext3rd/evolve/__init__.py", line
797, in warnobserrors
return orig(ui, repo, *args, **kwargs)
File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1644, in
check
return func(*args, **kwargs)
File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1644, in
check
return func(*args, **kwargs)
File "/usr/lib/python2.7/site-packages/hgext/mq.py", line 3631, in mqcommand
return orig(ui, repo, *args, **kwargs)
File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1644, in
check
return func(*args, **kwargs)
File "/usr/lib/python2.7/site-packages/hgext/rebase.py", line 838, in rebase
return _dryrunrebase(ui, repo, action, opts)
File "/usr/lib/python2.7/site-packages/hgext/rebase.py", line 887, in
_dryrunrebase
leaveunfinished=True)
File "/usr/lib/python2.7/site-packages/hgext/rebase.py", line 983, in
_origrebase
rbsrt._performrebase(tr)
File "/usr/lib/python2.7/site-packages/hgext/rebase.py", line 458, in
_performrebase
self._rebasenode(tr, rev, allowdivergence, progress)
File "/usr/lib/python2.7/site-packages/hgext/rebase.py", line 549, in
_rebasenode
dest, wctx=self.wctx)
File "/usr/lib/python2.7/site-packages/hgext/rebase.py", line 1205, in
rebasenode
labels=['dest', 'source'], wc=wctx)
File "/usr/lib/python2.7/site-packages/mercurial/merge.py", line 2178, in
update
stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)
File "/usr/lib/python2.7/site-packages/mercurial/merge.py", line 1646, in
applyupdates
for i, item in prog:
File "/usr/lib/python2.7/site-packages/mercurial/merge.py", line 1510, in
batchget
atomictemp=atomictemp)
File "/usr/lib/python2.7/site-packages/mercurial/context.py", line 2054, in
write
return self._parent.write(self._path, data, flags, **kwargs)
File "/usr/lib/python2.7/site-packages/mercurial/context.py", line 1866, in
write
self._auditconflicts(path)
File "/usr/lib/python2.7/site-packages/mercurial/context.py", line 1847, in
_auditconflicts
match = matchmod.match('/', '', [path + '/'], default=b'relpath')
File "/usr/lib/python2.7/site-packages/mercurial/match.py", line 176, in
match
kindpats = normalize(patterns, default, root, cwd, auditor, warn)
File "/usr/lib/python2.7/site-packages/mercurial/match.py", line 223, in
_donormalize
pat = pathutil.canonpath(root, cwd, pat, auditor)
File "/usr/lib/python2.7/site-packages/mercurial/pathutil.py", line 192, in
canonpath
auditor(name)
File "/usr/lib/python2.7/site-packages/mercurial/pathutil.py", line 101, in
__call__
self._checkfs(prefix, path)
File "/usr/lib/python2.7/site-packages/mercurial/pathutil.py", line 124, in
_checkfs
raise error.Abort(msg)
Abort: path 'lib/IPC/_/Context.pm' traverses symbolic link 'lib'
abandon : path 'lib/IPC/_/Context.pm' traverses symbolic link 'lib'
```
After some investigation, the problem start here.
## .../mercurial/context.py(1847)_auditconflicts()
# Test the other direction -- that this path from p2 isn't a directory
# in p1 (test that p1 doesn't any paths matching `path/*`).
match = matchmod.match('/', '',
[Bug 6026] New: umask unsoundness on creating .hg/cache/checklink?
https://bz.mercurial-scm.org/show_bug.cgi?id=6026 Bug ID: 6026 Summary: umask unsoundness on creating .hg/cache/checklink? Product: Mercurial Version: stable branch Hardware: All OS: Mac OS Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: duri...@gmail.com CC: mercurial-devel@mercurial-scm.org The BSD and Mac builders are currently sad like this: --- /usr/home/hg/buildslave/FreeBSD_hg_tests/build/tests/test-inherit-mode.t +++ /usr/home/hg/buildslave/FreeBSD_hg_tests/build/tests/test-inherit-mode.t.err @@ -70,7 +70,7 @@ 00770 ./.hg/cache/ 00660 ./.hg/cache/branch2-served 00711 ./.hg/cache/checkisexec - 00777 ./.hg/cache/checklink + 00700 ./.hg/cache/checklink 00600 ./.hg/cache/checklink-target 00660 ./.hg/cache/manifestfulltextcache (reporevlogstore !) 00660 ./.hg/cache/rbc-names-v1 The commentary in the test suggests to me that the permissions on the symlink should be 0770 or more permissive, not 0700. I can't quite figure out what's going on to make other directories etc have writable permissions for the group, but it seems like we should make it consistent? Caveat: I remember that permissions are weird for symlinks, but can't dredge up details and I need to work on other things right now. -- 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
[Bug 6025] New: `hg diff --git --stat` does not work correctly on renames
https://bz.mercurial-scm.org/show_bug.cgi?id=6025 Bug ID: 6025 Summary: `hg diff --git --stat` does not work correctly on renames Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: 7895pul...@gmail.com CC: mercurial-devel@mercurial-scm.org On a clean working directory, if you do a rename, and do `hg diff --stat --git`, you will see that it emits something like: ` | 0 1 files changed, 0 insertions(+), 0 deletions(-)` There is no mention of old file being deleted. If you do that same thing in git, i.e. `git diff --stat`, you will see the following: ` | 1 - | 1 + 2 file changes, 1 insertion(+), 1 deletion(-) ` The desired behavior should be same as what git does. -- 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
[Bug 6024] New: graft sometimes tries to remove a revision from the set to graft twice.
https://bz.mercurial-scm.org/show_bug.cgi?id=6024 Bug ID: 6024 Summary: graft sometimes tries to remove a revision from the set to graft twice. Product: Mercurial Version: 4.8 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: mozi...@hocat.ca CC: mercurial-devel@mercurial-scm.org The following sequence of commands triggers an error: export HGPLAIN=1 HGRCPATH= hg init base cd base touch x hg add x hg commit -minit -uuser echo a > x hg commit -mchange -uuser hg update 0 hg graft -r 1 cd .. hg clone -r 2 base clone cd clone hg pull hg merge 2 hg commit -m'merge' -uuser hg update 0 hg graft -r 1 hg update 3 hg graft -r 4 -- 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
[Bug 6023] New: phabread fails if there are inaccessible revisions and batchsize > 1
https://bz.mercurial-scm.org/show_bug.cgi?id=6023 Bug ID: 6023 Summary: phabread fails if there are inaccessible revisions and batchsize > 1 Product: Mercurial Version: stable branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: mozi...@hocat.ca CC: mercurial-devel@mercurial-scm.org (there doesn't yet appear to be a phabricator component) hg phabread tries to be efficient by speculatively reading ranges of revisions. However, if a revision that isn't needed fails to load (because it is private, perhaps) then it fails, even if that revision ends up not being needed. -- 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
[Bug 6022] New: histedit curses ui has prefixes in changeset data
https://bz.mercurial-scm.org/show_bug.cgi?id=6022 Bug ID: 6022 Summary: histedit curses ui has prefixes in changeset data Product: Mercurial Version: 4.8 Hardware: All OS: Linux Status: UNCONFIRMED Severity: bug Priority: normal Component: histedit Assignee: bugzi...@mercurial-scm.org Reporter: gregory.sz...@gmail.com CC: mercurial-devel@mercurial-scm.org Using histedit with the curses interface, the changeset data at the bottom of the window is prefixed with weird characters. The top portion of the UI (complete with coloring and highlighting) looks fine. Perhaps my terminal settings are wonky. But I find it weird the top half works but the bottom doesn't. Here is a paste of what is rendered on my screen: ?: help, k/up: move up, j/down: move down, space: select, v: view patch d: drop, e: edit, f: fold, m: mess, p: pick, r: roll pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort #0 mess 11723:ce81021c88a5 robustcheckout: record more granular metrics for overall times; r?sheehan #1 pick 11724:f09c578e7d88 robustcheckout: use commandexecutor API for "lookup" command; r?sheehan #2 pick 11725:14867cbdeaca INCOMPLETE robustcheckout: support partial checkouts (bug 1505407) lqk xchangeset: 11723:ce81021c88a5 x xuser: gps x xbookmark: x xfiles: hgext/robustcheckout/__init__.py,hgext/robustcheckout/tests/test-perfherder.t x xsummary: robustcheckout: record more granular metrics for overall times; r?sheehan x xno overlap x mqj -- 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
[Bug 6021] New: fastannotate doesn't work on hgweb
https://bz.mercurial-scm.org/show_bug.cgi?id=6021 Bug ID: 6021 Summary: fastannotate doesn't work on hgweb Product: Mercurial Version: 4.8 Hardware: All OS: All Status: UNCONFIRMED Severity: bug Priority: normal Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: gregory.sz...@gmail.com CC: mercurial-devel@mercurial-scm.org The monkeypatch of hgweb.webutil.annotate in support.py:_hgwebannotate() accepts the wrong number of arguments, leading to a crash at runtime if you enable the "hgweb" mode of fastannotate. In addition, the first line of _hgwebanntoate() should be calling webutil.difffeatureopts() to resolve diff options. In related news, it appears we have 0 test coverage of the fastannotate hgweb feature :/ -- 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
[Bug 6020] New: commands.resolve.mark-check breaks `hg resolve -m` if files are deleted
https://bz.mercurial-scm.org/show_bug.cgi?id=6020 Bug ID: 6020 Summary: commands.resolve.mark-check breaks `hg resolve -m` if files are deleted Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: h...@pewpew.net CC: mercurial-devel@mercurial-scm.org Users will receive an error about no such file or directory when the code attempts to look at the file that doesn't exist. I'm going to remove commands.resolve.mark-check from tweakdefaults until it's been more tested in real-world scenarios, this is the second case I didn't account for when writing the feature or the tests. -- 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
[Bug 6019] New: Unknown exception during narrow clone
https://bz.mercurial-scm.org/show_bug.cgi?id=6019 Bug ID: 6019 Summary: Unknown exception during narrow clone Product: Mercurial Version: 4.6.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: bundle2 Assignee: bugzi...@mercurial-scm.org Reporter: idls...@gmail.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org Our repo is configured to use narrow acl. One of the clients is getting this: requesting all changes adding changesets adding manifests adding file changes remote: ** unknown exception encountered, please report by visiting remote: ** https://mercurial-scm.org/wiki/BugTracker remote: ** Python 2.7.5 (default, Aug 4 2017, 00:39:18) [GCC 4.8.5 20150623 (Red Hat 4.8.5-16)] remote: ** Mercurial Distributed SCM (version 4.6.1) remote: ** Extensions loaded: narrow remote: Traceback (most recent call last): remote: File "/usr/bin/hg-ssh", line 93, in remote: main() remote: File "/usr/bin/hg-ssh", line 78, in main remote: dispatch.dispatch(req) remote: File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 210, in dispatch remote: ret = _runcatch(req) remote: File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 351, in _runcatch remote: return _callcatch(ui, _runcatchfunc) remote: File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 359, in _callcatch remote: return scmutil.callcatch(ui, func) remote: File "/usr/lib64/python2.7/site-packages/mercurial/scmutil.py", line 160, in callcatch remote: return func() remote: File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 341, in _runcatchfunc remote: return _dispatch(req) remote: File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 971, in _dispatch remote: cmdpats, cmdoptions) remote: File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 727, in runcommand remote: ret = _runcommand(ui, options, cmd, d) remote: File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 979, in _runcommand remote: return cmdfunc() remote: File "/usr/lib64/python2.7/site-packages/mercurial/dispatch.py", line 968, in remote: d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) remote: File "/usr/lib64/python2.7/site-packages/mercurial/util.py", line 1553, in check remote: return func(*args, **kwargs) remote: File "/usr/lib64/python2.7/site-packages/mercurial/commands.py", line 4788, in serve remote: s.serve_forever() remote: File "/usr/lib64/python2.7/site-packages/mercurial/wireprotoserver.py", line 806, in serve_forever remote: self.serveuntil(threading.Event()) remote: File "/usr/lib64/python2.7/site-packages/mercurial/wireprotoserver.py", line 811, in serveuntil remote: _runsshserver(self._ui, self._repo, self._fin, self._fout, ev) remote: File "/usr/lib64/python2.7/site-packages/mercurial/wireprotoserver.py", line 666, in _runsshserver remote: _sshv1respondstream(fout, rsp) remote: File "/usr/lib64/python2.7/site-packages/mercurial/wireprotoserver.py", line 480, in _sshv1respondstream remote: for chunk in source.gen: remote: File "/usr/lib64/python2.7/site-packages/mercurial/bundle2.py", line 673, in getchunks remote: self._compopts): remote: File "/usr/lib64/python2.7/site-packages/mercurial/bundle2.py", line 694, in _getcorechunk remote: for chunk in part.getchunks(ui=self.ui): remote: File "/usr/lib64/python2.7/site-packages/mercurial/bundle2.py", line 1067, in getchunks remote: paramsizes = _pack(_makefpartparamsizes(len(parsizes) // 2), *parsizes) remote: struct.error: ubyte format requires 0 <= number <= 255 added 9047 changesets with 25436 changes to 7028 files (+33 heads) transaction abort! rollback completed abort: stream ended unexpectedly (got 0 bytes, expected 4) -- 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
[Bug 6018] New: revset bookmark('re:nonexistent') aborts
https://bz.mercurial-scm.org/show_bug.cgi?id=6018
Bug ID: 6018
Summary: revset bookmark('re:nonexistent') aborts
Product: Mercurial
Version: 4.8
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: bookmarks
Assignee: bugzi...@mercurial-scm.org
Reporter: martinv...@google.com
CC: mercurial-devel@mercurial-scm.org
$ hg log -r "bookmark('re:nonexistent')"
abort: no bookmarks exist that match 'nonexistent'!
It seems like it should simply return an empty set. That's what
tag('re:nonexistent') does.
--
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
[Bug 6017] New: evolve 8.2.1 has a dependency on missing module
https://bz.mercurial-scm.org/show_bug.cgi?id=6017 Bug ID: 6017 Summary: evolve 8.2.1 has a dependency on missing module Product: Mercurial Version: 4.7.2 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Priority: normal Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: matt_harbi...@yahoo.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org I think I've run into this before recently and sent a note to the evolve list, but I hit it again pushing to an instance of `hg serve`: 10.30.1.91 - - [01/Nov/2018 16:04:34] "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 partial-pull 10.30.1.91 - - [01/Nov/2018 16:04:34] "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 partial-pull 10.30.1.91 - - [01/Nov/2018 16:04:34] "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 partial-pull 10.30.1.91 - - [01/Nov/2018 16:04:34] "POST /?cmd=unbundle HTTP/1.1" 500 - x-hgarg-1:heads=666f726365 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2 partial-pull 10.30.1.91 - - [01/Nov/2018 16:04:34] Exception happened during processing request '/?cmd=unbundle': Traceback (most recent call last): File "mercurial\hgweb\server.pyo", line 102, in do_POST File "mercurial\hgweb\server.pyo", line 95, in do_write File "mercurial\hgweb\server.pyo", line 187, in do_hgweb File "mercurial\hgweb\hgwebdir_mod.pyo", line 351, in run_wsgi File "mercurial\hgweb\hgweb_mod.pyo", line 308, in run_wsgi File "mercurial\hgweb\hgweb_mod.pyo", line 334, in _runwsgi File "mercurial\extensions.pyo", line 359, in closure File "hgext\lfs\wireprotolfsserver.pyo", line 38, in handlewsgirequest File "mercurial\wireprotoserver.pyo", line 223, in handlewsgirequest File "mercurial\wireprotoserver.pyo", line 438, in _callhttp File "mercurial\wireprotov1server.pyo", line 74, in dispatch File "mercurial\wireprotov1server.pyo", line 594, in unbundle File "mercurial\exchange.pyo", line 2149, in unbundle File "mercurial\transaction.pyo", line 44, in _active File "mercurial\transaction.pyo", line 522, in close File "mercurial\localrepo.pyo", line 1585, in updater File "mercurial\localrepo.pyo", line 147, in wrapper File "hgext3rd\evolve\obscache.pyo", line 487, in updatecaches File "mercurial\localrepo.pyo", line 147, in wrapper File "hgext3rd\evolve\firstmergecache.pyo", line 53, in updatecaches File "mercurial\localrepo.pyo", line 147, in wrapper File "hgext3rd\evolve\depthcache.pyo", line 91, in updatecaches File "mercurial\localrepo.pyo", line 147, in wrapper File "hgext3rd\evolve\stablesort.pyo", line 680, in updatecaches File "mercurial\localrepo.pyo", line 147, in wrapper File "hgext3rd\evolve\stablerangecache.pyo", line 440, in updatecaches File "mercurial\localrepo.pyo", line 130, in __get__ File "mercurial\util.pyo", line 1412, in __get__ File "hgext3rd\evolve\stablerangecache.pyo", line 427, in stablerange File "hgext3rd\evolve\genericcaches.pyo", line 109, in update File "hgext3rd\evolve\stablerangecache.pyo", line 380, in load File "mercurial\util.pyo", line 1412, in __get__ File "hgext3rd\evolve\stablerangecache.pyo", line 242, in _con File "hgext3rd\evolve\stablerangecache.pyo", line 236, in _db File "hgdemandimport\demandimportpy2.pyo", line 145, in __getattr__ File "hgdemandimport\demandimportpy2.pyo", line 90, in _load File "hgdemandimport\demandimportpy2.pyo", line 41, in _hgextimport File "sqlite3\__init__.pyo", line 24, in File "hgdemandimport\demandimportpy2.pyo", line 167, in _demandimport File "hgdemandimport\demandimportpy2.pyo", line 41, in _hgextimport File "sqlite3\dbapi2.pyo", line 28, in File "hgdemandimport\demandimportpy2.pyo", line 167, in _demandimport File "hgdemandimport\demandimportpy2.pyo", line 41, in _hgextimport File "_sqlite3.pyo", line 12, in File "_sqlite3.pyo", line 10, in __load ImportError: DLL load failed: The specified module could not be found. Maybe there are missing dependencies with `pip install hg-evolve`? -- 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
[Bug 6016] New: Revision selection prompt tries to translate changeset description
https://bz.mercurial-scm.org/show_bug.cgi?id=6016
Bug ID: 6016
Summary: Revision selection prompt tries to translate changeset
description
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: m...@manueljacob.de
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
How to reproduce:
- create one changeset with two children (one of them containing a non-ASCII
character in the description)
- update to the parent
- run "hg next"
Traceback (most recent call last):
File "/bin/hg", line 41, in
dispatch.run()
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 90, in
run
status = dispatch(req)
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 213, in
dispatch
ret = _runcatch(req) or 0
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 354, in
_runcatch
return _callcatch(ui, _runcatchfunc)
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 362, in
_callcatch
return scmutil.callcatch(ui, func)
File "/usr/lib/python2.7/site-packages/mercurial/scmutil.py", line 161, in
callcatch
return func()
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 344, in
_runcatchfunc
return _dispatch(req)
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 984, in
_dispatch
cmdpats, cmdoptions)
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 730, in
runcommand
ret = _runcommand(ui, options, cmd, d)
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 992, in
_runcommand
return cmdfunc()
File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 981, in
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1528, in
check
return func(*args, **kwargs)
File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1528, in
check
return func(*args, **kwargs)
File "/usr/lib/python2.7/site-packages/hgext/mq.py", line 3600, in mqcommand
return orig(ui, repo, *args, **kwargs)
File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 1528, in
check
return func(*args, **kwargs)
File
"/home/manu/.local/lib/python2.7/site-packages/hgext3rd/evolve/__init__.py",
line 1165, in cmdnext
choosedrev = utility.revselectionprompt(ui, repo, crevs, cheader)
File
"/home/manu/.local/lib/python2.7/site-packages/hgext3rd/evolve/utility.py",
line 165, in revselectionprompt
curctx.description().split("\n")[0]))
File "/usr/lib/python2.7/site-packages/mercurial/i18n.py", line 78, in
gettext
paragraphs = [p.decode("ascii") for p in message.split('\n\n')]
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 60:
ordinal not in range(128)
The problem is that, beginning with changeset 846f7d4fe47e, the function
"revselectionprompt" tries to translate the changeset description. I think
that this is incorrect in all cases, but only if one of the children contain a
non-ASCII character, there will be an exception.
--
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
[Bug 6015] New: IntegrityError when applying changesets
https://bz.mercurial-scm.org/show_bug.cgi?id=6015 Bug ID: 6015 Summary: IntegrityError when applying changesets Product: Mercurial Version: stable branch Hardware: All OS: All Status: UNCONFIRMED Keywords: regression, releaseblocker Severity: bug Priority: critical Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: gregory.sz...@gmail.com CC: lothiral...@gmail.com, mercurial-devel@mercurial-scm.org I ran `hg pull` against the mutable-history repo today using @ and encountered an IntegrityError in the bowels of revlogs. Bisection revealed 5aef5afa8654 as the culprit: https://www.mercurial-scm.org/repo/hg/rev/5aef5afa8654 I /think/ the underlying problem is related to revlog's various caches and this changeset managed to tickle it somehow. It is quite possible other changesets refactoring delta computation introduced the bug. Because the crash is bisected to new code in 4.8, I'm calling this a regression and release blocker. I'm actively debugging the issue. -- 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
[Bug 6014] New: hg showconfig --give-me-default-value and --give-me-current-value-even-if-it-is-the-default
https://bz.mercurial-scm.org/show_bug.cgi?id=6014 Bug ID: 6014 Summary: hg showconfig --give-me-default-value and --give-me-current-value-even-if-it-is-the-default Product: Mercurial Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: a...@dwimlabs.net CC: mercurial-devel@mercurial-scm.org Looking at such tools as postconf (postfix) and doveconf (dovecot) and comparing how they work with hg showconfig, one flaw in the latter is obvious: it cannot be reliably used to just get the current setting. For example, when user doesn't set ui.color anywhere in config files, the default value for it is 'auto' (configitems.py). But `hg showconfig ui.color` outputs nothing, IOW an empty string, and not 'auto'. If a script (e.g. shell prompt or completion file) decides to peek at certain config values (they don't have to be related to color, of course), it will need to know to substitute empty results from `hg showconfig` for a default value... and there's also no way to get that default value lest it parses mercurial/configitems.py. What do the config tools from postfix and dovecot do then? Here are some flags from their man pages: > postconf: -d print default parameter settings instead of actual settings > -n Show only configuration parameters that have explicit > name=value settings > doveconf: -n Show only settings with non-default values. [*] Maybe showconfig could grow similar flags (names bikesheddable): -d/--default to print default value and -a/--any for any value, including default. Or maybe it's worth a BC to make `hg showconfig foo` print value of foo even if it's not configured anywhere explicitly. [*] doveconf is actually used to parse config files and feed the results to the rest of the dovecot system, so printing all possible key=value by default pairs makes perfect sense. Not the case of hg showconfig, but still. -- 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
[Bug 6013] New: Allow specifying additional paths to search for template files.
https://bz.mercurial-scm.org/show_bug.cgi?id=6013 Bug ID: 6013 Summary: Allow specifying additional paths to search for template files. Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: templater Assignee: bugzi...@mercurial-scm.org Reporter: mozi...@hocat.ca CC: mercurial-devel@mercurial-scm.org Currently, templates are hard-coded to lookup templates in the mercurial package. It would be nice to be able to add some config, to allow also looking other paths, to allow overriding or extending the builtin templates. -- 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
[Bug 6012] New: Same behavior for bookmark "master" than for "@" ?
https://bz.mercurial-scm.org/show_bug.cgi?id=6012 Bug ID: 6012 Summary: Same behavior for bookmark "master" than for "@" ? Product: Mercurial Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: feature Priority: wish Component: bookmarks Assignee: bugzi...@mercurial-scm.org Reporter: pierre.aug...@univ-grenoble-alpes.fr CC: mercurial-devel@mercurial-scm.org In https://www.mercurial-scm.org/wiki/Bookmarks, there is written: "If you have a bookmark named @ when cloning a remote repository, "hg clone" will check it out by default." When using hg-git, the name of the special bookmark corresponding to the master git branch is master. When one clones a repository with the bookmark master in the default branch, the bookmark master is not checked out by default. We get the tip of the default branch which can be anything. Wouldn't it be good to check out the master bookmark if there is no bookmark @ ? -- 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
[Bug 6011] New: Merging recreating deleted files
https://bz.mercurial-scm.org/show_bug.cgi?id=6011 Bug ID: 6011 Summary: Merging recreating deleted files Product: Mercurial Version: 4.7.2 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: korita...@gmail.com CC: mercurial-devel@mercurial-scm.org In repo: https://bitbucket.org/koritakoa/hg-merge-test/ % hg up -r 4e0d700 % hg merge -r 583eb25 This recreates files which were previously deleted in f0ee7db. This is not what I expect. I expect `hg status` to be empty after `hg merge`. More discussion at: https://www.mercurial-scm.org/pipermail/mercurial/2018-October/051034.html (detailed discussion about the bug) https://www.mercurial-scm.org/pipermail/mercurial/2018-October/051038.html (changes to behaviour across different versions of HG) -- 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
[Bug 6010] New: `hg evolve --content-divergent` can fail to continue
https://bz.mercurial-scm.org/show_bug.cgi?id=6010 Bug ID: 6010 Summary: `hg evolve --content-divergent` can fail to continue Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: martinv...@google.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org I don't know how this happened, but we had one case where the user ran `hg evolve --content-divergent`. It merged one of the content-divergent commits with the obsolete parent of the other side of the divergence instead of merging with the other content-divergent commit itself. This resulted in conflicts and the working copy ended up with a merge state and an evolve state. Following the steps from --dry-run worked (they said to merge with the other content-divergent commit, not with the base). Here is a redacted version of the obslog: @0d1b29e85ec7 (2787) |\ | | x 69061fd99fea (2736) | | | | | | * fcd4ef74ca7a (2759) @ | | | 229a6713d859 (2758) | | | | | x | | 4c77e395e048 (2774) | | | | | x | |8e92750fd3e9 (2741) | |\ \ \ | x | | | 2c8d4ee9be8d (2738) |/ / / / | x---+ 7b3fc6bdcd5d (2739) | / / x | | 51fd0be1b2c3 (2714) |/ / | | | x 6c2fb6288dbe (2715) | | x 578d48645d38 (2710) As you can see, it was supposed to be 2787 and 2759 that were merged. Let me know if you need more details. -- 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
[Bug 6009] New: Traceback when pressing Enter in interactive commit
https://bz.mercurial-scm.org/show_bug.cgi?id=6009 Bug ID: 6009 Summary: Traceback when pressing Enter in interactive commit Product: Mercurial Version: stable branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: z...@zash.se CC: mercurial-devel@mercurial-scm.org $ hg status -q obsolete feature not enabled but 4809 markers found! ( evolve disabled to see if this happens without ) M core/certmanager.lua M core/moduleapi.lua M net/server_epoll.lua $ hg ci -i obsolete feature not enabled but 4809 markers found! starting interactive selection Press Enter, get traceback: ** unknown exception encountered, please report by visiting ** https://mercurial-scm.org/wiki/BugTracker ** Python 2.7.13 (default, Sep 26 2018, 18:42:22) [GCC 6.3.0 20170516] ** Mercurial Distributed SCM (version 4.8rc0) ** Extensions loaded: extdiff, fix, githelp, histedit, journal, purge, rebase, releasenotes, relink, schemes, shelve, show, strip, transplant Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/mercurial/commandserver.py", line 353, in _serverequest sv.serve() File "/usr/lib/python2.7/dist-packages/mercurial/commandserver.py", line 301, in serve while self.serveone(): File "/usr/lib/python2.7/dist-packages/mercurial/commandserver.py", line 276, in serveone handler(self) File "/usr/lib/python2.7/dist-packages/mercurial/chgserver.py", line 487, in runcommand return super(chgcmdserver, self).runcommand() File "/usr/lib/python2.7/dist-packages/mercurial/commandserver.py", line 260, in runcommand ret = dispatch.dispatch(req) & 255 File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 220, in dispatch ret = _runcatch(req) or 0 File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 363, in _runcatch return _callcatch(ui, _runcatchfunc) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 371, in _callcatch return scmutil.callcatch(ui, func) File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 166, in callcatch return func() File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 354, in _runcatchfunc return _dispatch(req) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 994, in _dispatch cmdpats, cmdoptions) File "/usr/lib/python2.7/dist-packages/hgext/journal.py", line 90, in runcommand return orig(lui, repo, cmd, fullargs, *args) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 737, in runcommand ret = _runcommand(ui, options, cmd, d) File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 1003, in _runcommand return cmdfunc() File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 991, in d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1644, in check return func(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line 1631, in commit return _docommit(ui, repo, *pats, **opts) File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line 1638, in _docommit **opts) File "/usr/lib/python2.7/dist-packages/mercurial/cmdutil.py", line 417, in dorecord return commit(ui, repo, recordinwlock, pats, opts) File "/usr/lib/python2.7/dist-packages/mercurial/cmdutil.py", line 2398, in commit return commitfunc(ui, repo, message, matcher, opts) File "/usr/lib/python2.7/dist-packages/mercurial/cmdutil.py", line 415, in recordinwlock return recordfunc(ui, repo, message, match, opts) File "/usr/lib/python2.7/dist-packages/mercurial/cmdutil.py", line 294, in recordfunc chunks, newopts = filterfn(ui, originalchunks) File "/usr/lib/python2.7/dist-packages/mercurial/cmdutil.py", line 232, in recordfilter testfile, operation) File "/usr/lib/python2.7/dist-packages/mercurial/cmdutil.py", line 213, in filterchunks operation) File "/usr/lib/python2.7/dist-packages/mercurial/crecord.py", line 505, in filterpatch ret = chunkselector(ui, uiheaders, operation=operation) File "/usr/lib/python2.7/dist-packages/mercurial/crecord.py", line 536, in chunkselector curses.wrapper(chunkselector.main) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/usr/lib/python2.7/dist-packages/mercurial/crecord.py", line 1739, in main return self._main(stdscr) File "/usr/lib/python2.7/dist-packages/mercurial/crecord.py", line 1798, in _main if self.handlekeypressed(keypressed): File "/usr/lib/python2.7/dist-packages/mercurial/crecord.py", line 1710, in handlekeypressed self.nextsametype() File
[Bug 6008] New: `hg revert -i` undeletes removed files without being able to stop it
https://bz.mercurial-scm.org/show_bug.cgi?id=6008 Bug ID: 6008 Summary: `hg revert -i` undeletes removed files without being able to stop it Product: Mercurial Version: 4.7.2 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: martinv...@google.com CC: mercurial-devel@mercurial-scm.org For added files, it asks something like "forget added file .testtimes (Yn)?", so it seems it should ask about adding back removed files as well. -- 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
[Bug 6007] New: ui.tweakdefaults=false doesn't quite work
https://bz.mercurial-scm.org/show_bug.cgi?id=6007 Bug ID: 6007 Summary: ui.tweakdefaults=false doesn't quite work Product: Mercurial Version: 4.7 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: vgatien-ba...@janestreet.com CC: mercurial-devel@mercurial-scm.org I was looking at ui.tweakdefaults, and noticed and got a report of chg getting stuck with the wrong setting, see test below. I expect ui.tweakdefaults=false to mean "ignore any previous ui.tweakdefaults=true" but that's not what happens. One can see weirdness even without chg, so chg may not be the source of the problem. $ hg init . $ cat >> .hg/hgrc < [ui] > tweakdefaults = true > EOF $ mkdir a $ cd a $ touch b $ hg st # ok ? b $ hg st --config ui.tweakdefaults=false # ok ? a/b $ hg st --config ui.tweakdefaults=true --config ui.tweakdefaults=false # weird? ? b # Same thing as above with chg returns different result: $ chg st # ok ? b $ chg st --config ui.tweakdefaults=false # not ok ? b -- 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
[Bug 6006] New: pulling from evolve repo created corrupted revlog (generaldelta disabled)
https://bz.mercurial-scm.org/show_bug.cgi?id=6006 Bug ID: 6006 Summary: pulling from evolve repo created corrupted revlog (generaldelta disabled) Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: y...@tcha.org CC: mercurial-devel@mercurial-scm.org STR: 1. extract the attached repository 2. run "HGRCPATH=/dev/null hg pull" 3. run "hg verify" checking changesets checking manifests crosschecking files in changesets and manifests checking files tests/test-amend.t@4208: unpacking c691fd126089: integrity check failed on data/tests/test-amend.t.i:61 checked 4212 changesets with 9260 changes to 421 files 1 integrity errors encountered! (first damaged changeset appears to be 4208) This time, "hg verify" reported the bad revision, and which revlog text appeared to be shorter than the good text pulled by using Mercurial 4.7.2. The first bad revision is 5aef5afa8654 "snapshot: refine candidate snapshot base upward", but I don't know if that's relevant. -- 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
[Bug 6005] New: command declaration broken for extensions
https://bz.mercurial-scm.org/show_bug.cgi?id=6005 Bug ID: 6005 Summary: command declaration broken for extensions Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: lothiral...@gmail.com CC: mercurial-devel@mercurial-scm.org Changeset fa88170c10bb changes the way we declare command name that should be present in the shortlist. Previously, such names were prefixed with "^", now we use an explicit declaration in the command decorator. This change has the unfortunate side effect of breaking all extensions declaring command with leading "^". We should keep the compatibility around for at least a cycle, with a developer warning. -- 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
[Bug 6004] New: title: statprof skips many lines when displaying hotpath
https://bz.mercurial-scm.org/show_bug.cgi?id=6004 Bug ID: 6004 Summary: title: statprof skips many lines when displaying hotpath Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: lothiral...@gmail.com CC: mercurial-devel@mercurial-scm.org Since the python3 compatibility series, hotpath display is broken. Most lines are skipped from the output. Only "grey" line appears, the white and red ones do not. Backing out the full series fix the issue: 2864f8d3fcd6 + b594db74dc13 + 7df42042636d + 9d3034348c4f + 113adb1b3f24 + 4b7eb862692e -- 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
[Bug 6003] New: statprof.py no longer gather results
https://bz.mercurial-scm.org/show_bug.cgi?id=6003 Bug ID: 6003 Summary: statprof.py no longer gather results Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: lothiral...@gmail.com CC: mercurial-devel@mercurial-scm.org After changeset 2864f8d3fcd6, hg --profile no longer display any output. Digging a bit, it seems to not gather any data during the run. -- 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
[Bug 6002] New: allsuccessors(-1) complains about nullid being pruned
https://bz.mercurial-scm.org/show_bug.cgi?id=6002 Bug ID: 6002 Summary: allsuccessors(-1) complains about nullid being pruned Product: Mercurial Version: unspecified Hardware: PC OS: Mac OS Status: UNCONFIRMED Severity: feature Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: h...@pewpew.net CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org ≻ cat test-nullrev.t $ cat >> $HGRCPATH < [extensions] > evolve = > EOF $ hg init r $ cd r $ echo hi > a $ hg ci -qAm a This works, as long as there's no obsolescence in the repo $ hg log -r 'allsuccessors(-1)' $ echo hi2 > a $ hg ci -qm a2 Add some obsolescence (strangely, if I use `hg debugobsolete` this does NOT reproduce) $ hg prune -r tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at 54894f3cc22c 1 changesets pruned Now it doesn't work $ hg log -r 'allsuccessors(-1)' abort: hidden revision '-1' is pruned! (use --hidden to access hidden revisions) [255] nullid always seems to work $ hg log -r 'allsuccessors(0)' -- 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
[Bug 6001] New: Performance regression on bundle in 4.7
https://bz.mercurial-scm.org/show_bug.cgi?id=6001 Bug ID: 6001 Summary: Performance regression on bundle in 4.7 Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: lothiral...@gmail.com CC: mercurial-devel@mercurial-scm.org Our automatic tooling has detected a regression that impact both bundle http://perf.octobus.net/#basic_commands.BundleTimeTestSuite.time_bundle?branch=default=4971c972-98995b68=bce1c1af-41fcdfe3='netbeans-2018-08-01'=1000 and incoming with http or ssh http://perf.octobus.net/#basic_commands.ExchangeTimeSuite.time_incoming?branch=default=bce1c1af-41fcdfe3='netbeans-2018-08-01'_type='ssh'='last-thousand'=None and push http://perf.octobus.net/#basic_commands.PushPullTimeSuite.time_push?branch=default=bce1c1af-41fcdfe3='netbeans-2018-08-01'_type='local'='last-thousand'=None for the netbeans repository. Bisection have identified https://www.mercurial-scm.org/repo/hg/rev/db5501d9 as the main responsible for the regression. Other repositories doesn't seems impacted. The regression has been reproduced locally. -- 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
[Bug 6000] New: ui.tweakdefaults needs to be better documented
https://bz.mercurial-scm.org/show_bug.cgi?id=6000 Bug ID: 6000 Summary: ui.tweakdefaults needs to be better documented Product: Mercurial Version: default branch Hardware: PC OS: Mac OS Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: duri...@gmail.com CC: mercurial-devel@mercurial-scm.org We need to make it easier to figure out what ui.tweakdefaults is doing, and how to reverse any parts of it the user finds objectionable. -- 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
[Bug 5999] New: Build bots need the vcr module installed
https://bz.mercurial-scm.org/show_bug.cgi?id=5999 Bug ID: 5999 Summary: Build bots need the vcr module installed Product: Mercurial project Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: feature Priority: normal Component: infrastructure Assignee: bugzi...@mercurial-scm.org Reporter: matt_harbi...@yahoo.com CC: kbullock+mercur...@ringworld.org, mercurial-devel@mercurial-scm.org Without it, they all skip the phabricator test, which is currently broken. (It seems to be a problem with the test itself, not the extension functionality.) -- 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
