mercurial@51144: 2 new changesets

2023-11-25 Thread Mercurial Commits
2 new changesets in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/d6e5bec550f1
changeset:   51143:d6e5bec550f1
user:pacien 
date:Wed Nov 15 02:39:53 2023 +0100
summary: util: move diff_parent from logcmdutil to diffutil

https://www.mercurial-scm.org/repo/hg/rev/9ff3d5395d6b
changeset:   51144:9ff3d5395d6b
tag: tip
user:pacien 
date:Tue Nov 14 22:47:17 2023 +0100
summary: templatekw: fix inconsistency of diffstat with diff.merge

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


[Bug 6854] New: crush report: on incoming

2023-11-25 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6854

Bug ID: 6854
   Summary: crush report: on incoming
   Product: Mercurial
   Version: 6.6rc0
  Hardware: PC
OS: Windows
Status: UNCONFIRMED
  Severity: bug
  Priority: wish
 Component: evolution
  Assignee: bugzi...@mercurial-scm.org
  Reporter: alexraynepe...@gmail.com
CC: mercurial-de...@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
Python Version: ---

hallow!
here is my try 'incoming' evolve with mercurial 6.6 and evolve 11.1.0

```
% hg incoming --quiet --bundle
"C:\Users\netuser\AppData\Local\Temp\thg.cn25p30n\ssh__hg@foss.heptapod.net_mercurial_evolve_j2f4bfdq.hg"
--force --debug ssh://h...@foss.heptapod.net/mercurial/evolve
running C:\util\TortoisePlink.exe -ssh -2 "h...@foss.heptapod.net" "hg -R
mercurial/evolve serve --stdio"
sending hello command
sending between command
remote: 610
remote: capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1
_exttopics_heads batch branchmap
bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%2C03%0Acheckheads%3Drelated%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Aext-configexpress%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Astream%3Dv2
changegroupsubset ext-topics-publish=auto getbundle known lookup protocaps
pushkey streamreqs=generaldelta,revlogv1,sparserevlog topics topics-namespaces
unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
remote: 1
sending protocaps command
сравниваем с ssh://h...@foss.heptapod.net/mercurial/evolve
obscache is out of date
query 1; heads
sending batch command
поиск изменений
taking initial sample
query 2; still undecided: 8, sample size is: 8
sending known command
2 total queries in 0.3322s
sending getbundle command
bundle2-input-part: total payload size 245733
bundle2-input-part: total payload size 1160
preparing listkeys for "phases"
sending listkeys command
received listkey for "phases": 53534 bytes
obsolete feature not enabled but 33237 markers found!
obscache is out of date
changeset:   6821:017fd6b302eb4d31138dc002408db032c401e9f8
** unknown exception encountered, please report by visiting
** https://mercurial-scm.org/wiki/BugTracker
** Python 3.8.3 (tags/v3.8.3:6f8c832, May 13 2020, 22:37:02) [MSC v.1924 64 bit
(AMD64)]
** Распределенная система контроля версий Mercurial (версия 6.5.3)
** Загруженные расширения: absorb, amend, censor, convert, eol, evolve
11.1.1.dev0, fix, histedit, mq, narrow, patchbomb, rebase, record, share,
sparse, strip, topic 1.1.1.dev0, tortoisehg.util.hgcommands
6.5.1+16-191a6f1e65e7, tortoisehg.util.hgdispatch 6.5.1+16-191a6f1e65e7,
tortoisehg.util.partialcommit 6.5.1+16-191a6f1e65e7, tortoisehg.util.pipeui
6.5.1+16-191a6f1e65e7, tortoisehg.util.win32ill 6.5.1+16-191a6f1e65e7,
transplant
** unknown exception encountered, please report by visiting
** https://mercurial-scm.org/wiki/BugTracker
** Python 3.8.3 (tags/v3.8.3:6f8c832, May 13 2020, 22:37:02) [MSC v.1924 64 bit
(AMD64)]
** Распределенная система контроля версий Mercurial (версия 6.5.3)
** Загруженные расширения: absorb, amend, censor, convert, eol, evolve
11.1.1.dev0, fix, histedit, mq, narrow, patchbomb, rebase, record, share,
sparse, strip, topic 1.1.1.dev0, tortoisehg.util.hgcommands
6.5.1+16-191a6f1e65e7, tortoisehg.util.hgdispatch 6.5.1+16-191a6f1e65e7,
tortoisehg.util.partialcommit 6.5.1+16-191a6f1e65e7, tortoisehg.util.pipeui
6.5.1+16-191a6f1e65e7, tortoisehg.util.win32ill 6.5.1+16-191a6f1e65e7,
transplant
Traceback (most recent call last):
  File "D:\projects\hg\thg\thg.work\venv.py38\Scripts\hg", line 59, in 
dispatch.run()
  File
"D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\dispatch.py",
line 143, in run
status = dispatch(req)
  File
"D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\dispatch.py",
line 232, in dispatch
status = _rundispatch(req)
  File
"D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\dispatch.py",
line 276, in _rundispatch
ret = _runcatch(req) or 0
  File
"D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\dispatch.py",
line 457, in _runcatch
return _callcatch(ui, _runcatchfunc)
  File
"D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\dispatch.py",
line 467, in _callcatch
return scmutil.callcatch(ui, func)
  File
"D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\scmutil.py",
line 153, in callcatch
return func()
  File
"D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\dispatch.py",
line 447, in _runcatchfunc
return _dispatch(req)
  File
"D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\dispatch.py",
line 1272, in _dispatch
return runcommand(
  File