thg issueshttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues2020-12-03T06:09:58Zhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5640[mq] delete patch with keep files don't save files2020-12-03T06:09:58Zlong76[mq] delete patch with keep files don't save filesdelete unapplied patch with "keep files" don't save files in work directory.
add strip(`hg strip -k patchname`) for aplied patch. Thanks!delete unapplied patch with "keep files" don't save files in work directory.
add strip(`hg strip -k patchname`) for aplied patch. Thanks!https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5657Displaying current working directory changes with Ctrl+S revision set query?2020-12-03T06:05:06ZArtalusDisplaying current working directory changes with Ctrl+S revision set query?This is what I get in a default view:
![image](/uploads/b1dcf40effd2f5a3b63642f90a633bb2/image.png)
This is after filtering by non-pushed stuff (via `not public() or (heads(public()) and not closed()) or .`):
![image](/uploads/63009d4a...This is what I get in a default view:
![image](/uploads/b1dcf40effd2f5a3b63642f90a633bb2/image.png)
This is after filtering by non-pushed stuff (via `not public() or (heads(public()) and not closed()) or .`):
![image](/uploads/63009d4ab72e02a20895c9bc54ae597c/image.png)
I'd like to also display my current changes to be able to commit them, but if I add ` or wdir()` (according to https://www.mercurial-scm.org/repo/hg/help/revsets) I get `b"unknown revision '2147483646'"` error
```
#!python
** Mercurial version (5.6). TortoiseHg version (5.6+80-a3bcac8c7318)
** Command:
** CWD: /home/iivanov
** Encoding: UTF-8
** Extensions loaded: clonebundles, extdiff, largefiles, graphlog, histedit, rebase, strip, mq, purge, tortoisehg.util.configitems
** Python version: 3.8.5 (default, Sep 5 2020, 10:50:12) [GCC 10.2.0]
** System: Linux dssl 4.19.147-1-MANJARO #1 SMP Wed Sep 23 18:00:56 UTC 2020 x86_64
** Qt-5.15.1 PyQt-5.15.1 QScintilla-2.11.5
Traceback (most recent call last):
File "/home/iivanov/.local/lib/python3.8/site-packages/mercurial/localrepo.py", line 1672, in __getitem__
node = self.changelog.node(changeid)
File "/home/iivanov/.local/lib/python3.8/site-packages/mercurial/revlog.py", line 876, in node
return self.index[rev][7]
IndexError: revlog index out of range
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/home/iivanov/.local/lib/python3.8/site-packages/tortoisehg/hgqt/repomodel.py", line 357, in _onQueryFinished
self._applyRevsetResult(revs)
File "/home/iivanov/.local/lib/python3.8/site-packages/tortoisehg/hgqt/repomodel.py", line 366, in _applyRevsetResult
self._rebuildGraph()
File "/home/iivanov/.local/lib/python3.8/site-packages/tortoisehg/hgqt/repomodel.py", line 269, in _rebuildGraph
newgraph.build_nodes(self._fill_step)
File "/home/iivanov/.local/lib/python3.8/site-packages/tortoisehg/hgqt/graph.py", line 965, in build_nodes
for gnode in self.grapher:
File "/home/iivanov/.local/lib/python3.8/site-packages/tortoisehg/hgqt/graph.py", line 605, in _iter_graphnodes
for ctx, parents in dag.walk():
File "/home/iivanov/.local/lib/python3.8/site-packages/tortoisehg/hgqt/graph.py", line 524, in walk
for ctx in self._iter_revs(repo, lambda rev: True):
File "/home/iivanov/.local/lib/python3.8/site-packages/tortoisehg/hgqt/graph.py", line 339, in _iter_revs
yield repo[curr_rev]
File "/home/iivanov/.local/lib/python3.8/site-packages/tortoisehg/hgqt/thgrepo.py", line 814, in __getitem__
changectx = super(thgrepository, self).__getitem__(changeid)
File "/home/iivanov/.local/lib/python3.8/site-packages/hgext/largefiles/reposetup.py", line 48, in __getitem__
ctx = super(lfilesrepo, self).__getitem__(changeid)
File "/home/iivanov/.local/lib/python3.8/site-packages/mercurial/localrepo.py", line 1716, in __getitem__
raise error.RepoLookupError(
mercurial.error.RepoLookupError: b"unknown revision '2147483646'"
```https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/113shellext: Disable icon overlays per repository2020-11-24T22:59:22ZBitbucket Importershellext: Disable icon overlays per repository*Created originally on Bitbucket by [arussell (Adam Russell)](https://bitbucket.org/%7Bab202c29-705a-493f-801e-e507080b65e0%7D/)*
I'd like to be able to disable overlay icons (or even TortoiseHg completely) on a per-repository basis. My...*Created originally on Bitbucket by [arussell (Adam Russell)](https://bitbucket.org/%7Bab202c29-705a-493f-801e-e507080b65e0%7D/)*
I'd like to be able to disable overlay icons (or even TortoiseHg completely) on a per-repository basis. My use case is that my home directory is controlled by Mercurial (with almost everything ignored), but I also have Subversion repositories or other Mercurial repositories in subdirectories that I don't want to conflict with my home repository.
Related bugs have already been filed in the past, but they are on the stable repository:
https://bitbucket.org/tortoisehg/stable/issue/382/disable-icon-overlays-per-repository
https://bitbucket.org/tortoisehg/stable/issue/1479/add-an-ability-to-disable-overlayicons-in
I've tried with no success adding @@noicons to .hg/thgstatus and even tried adding to .hg/hgrc:
[tortoisehg]
overlayicons = Falsehttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/33thg shortcuts outdated2020-11-24T22:59:20ZBitbucket Importerthg shortcuts outdated*Created originally on Bitbucket by [johansamyn (Johan Samyn)](https://bitbucket.org/%7B9c10eb3e-883d-43e9-988f-cdc051634361%7D/)*
A few days ago I installed Thg in a Win7 virtual machine. I created a desktop shortcut (via rightclick th...*Created originally on Bitbucket by [johansamyn (Johan Samyn)](https://bitbucket.org/%7B9c10eb3e-883d-43e9-988f-cdc051634361%7D/)*
A few days ago I installed Thg in a Win7 virtual machine. I created a desktop shortcut (via rightclick the Workbench entry as installed and choosing 'send to'), and also pinned the Workbench to the startmanu.
When I install a newer thg nightly build, those shortcuts are no longer valid. Windows shows a message "Problem with shortcut - This action is only valid for products that are currently instgalled." for both of them. This is something I never experienced with shortcuts created the same way for other software, nor with the gtk version.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5651thg on windows suddenly infer extra ignores to my repo2020-11-19T18:09:12Zalexraynethg on windows suddenly infer extra ignores to my repoHallow!
work on win8. trying to fing my loosed libraryes found that mercurial under thg suddenly extends my .hgignore with some other expressions. Therefore i loose *.lib files on my repo
installed thg5.6 x64 : Mercurial-5.5(or 5.6), Py...Hallow!
work on win8. trying to fing my loosed libraryes found that mercurial under thg suddenly extends my .hgignore with some other expressions. Therefore i loose *.lib files on my repo
installed thg5.6 x64 : Mercurial-5.5(or 5.6), Python-2.7.17, PyQt-5.13.2, Qt-5.9.9
invoke command shell on my repo, and give command:
```
D:\projects\lora\loramac-node.hggit>hg debugignore
*** эх єфрыюё№ шьяюЁЄшЁютрЄ№ Ёрё°шЁхэшх hggit шч D:\projects\hg\hg-git\hggit\: N
o module named 'dulwich'
*** эх єфрыюё№ шьяюЁЄшЁютрЄ№ Ёрё°шЁхэшх evolve: No module named 'evolve'
*** эх єфрыюё№ шьяюЁЄшЁютрЄ№ Ёрё°шЁхэшх hgfluiddyn: No module named 'hgfluiddyn'
<includematcher includes='(?:|.*/).*\\.git(?:/|$)|(?:|.*/).*\\.rej(?:/|$)|(?:|.*
/).*\\.orig(?:/|$)|(?:|.*/).*\\.patch(?:/|$)|(?:|.*/)Thumbs\\.db(?:/|$)|.*\\.obj
(?:/|$)|.*\\.exe(?:/|$)|.*\\.pdb(?:/|$)|.*\\.user(?:/|$)|.*\\.aps(?:/|$)|.*\\.pc
h(?:/|$)|.*\\.vspscc(?:/|$)|.*_i\\.c(?:/|$)|.*_p\\.c(?:/|$)|.*\\.ncb(?:/|$)|.*\\
.suo(?:/|$)|.*\\.tlb(?:/|$)|.*\\.tlh(?:/|$)|.*\\.bak(?:/|$)|.*\\.cache(?:/|$)|.*
\\.ilk(?:/|$)|.*\\.log(?:/|$)|.*\\.dll(?:/|$)|.*\\.lib(?:/|$)|.*\\.sbr(?:/|$)'>
```
when invoke same from native shell (provided by windows, not by thg):
```
D:\projects\lora\loramac-node.hggit>hg debugignore
*** эх єфрыюё№ шьяюЁЄшЁютрЄ№ Ёрё°шЁхэшх evolve: No module named 'evolve'
*** эх єфрыюё№ шьяюЁЄшЁютрЄ№ Ёрё°шЁхэшх hggit: No module named 'hggit'
<includematcher includes='(?:|.*/).*\\.git(?:/|$)|(?:|.*/).*\\.rej(?:/|$)|(?:|.*/).*\\.orig(?:/|$)|(
?:|.*/).*\\.patch(?:/|$)'>
D:\projects\lora\loramac-node.hggit>
```
now see, why my *.lib files are ignoredhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5646segfault after upgrade to Fedora 332020-11-19T15:17:56Zpaul leroysegfault after upgrade to Fedora 33I had many issues with TortoiseHg on Fedora 32 (possible to launch it but impossible to use it due to a lack of compatibility with Python 3 as far as I understand it). After my upgrade to Fedora 33, it was impossible to launch TortoiseHg...I had many issues with TortoiseHg on Fedora 32 (possible to launch it but impossible to use it due to a lack of compatibility with Python 3 as far as I understand it). After my upgrade to Fedora 33, it was impossible to launch TortoiseHg.
Mitigation: remove TortoiseHgQt.ini from ~/.config/TortoiseHg
That's all folks! It works now.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5650Diff window shows obj-c func in blue color. It is annoying2020-11-18T19:35:53ZVladDiff window shows obj-c func in blue color. It is annoying![Screenshot_2020-11-18_at_20.53.04](/uploads/a250d454a0166b7ecb265c3fe0b77bc7/Screenshot_2020-11-18_at_20.53.04.png)![Screenshot_2020-11-18_at_20.53.04](/uploads/a250d454a0166b7ecb265c3fe0b77bc7/Screenshot_2020-11-18_at_20.53.04.png)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5619Searches that return one result dont let you select the result with context menu2020-11-16T15:31:37Zsuperxpro12Searches that return one result dont let you select the result with context menuOn TortoiseHg v5.5.1, if I search for a commit using a hash, and that search returns only one result, right clicking on that result executes actions on the revision that was selected BEFORE the search was executed.
Left or right clickin...On TortoiseHg v5.5.1, if I search for a commit using a hash, and that search returns only one result, right clicking on that result executes actions on the revision that was selected BEFORE the search was executed.
Left or right clicking on the search result does not change the target of the context menus.
I have noticed this behavior as far back as version 4.9.0https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5639propose extended repoview navigation keys2020-10-23T15:20:36Zalexraynepropose extended repoview navigation keysHere provided extended navigating over repo history by keys.
- keys Alt+Up/Dn - go to first child/parent from current selected.
- keys Alt+Rt/Lf - go to next child/parent from last selected.
- key Alt+End - go current work revision
- k...Here provided extended navigating over repo history by keys.
- keys Alt+Up/Dn - go to first child/parent from current selected.
- keys Alt+Rt/Lf - go to next child/parent from last selected.
- key Alt+End - go current work revision
- key Alt+ Home - go to workcopy item
also provided config navkeys in resources/.rc at section [navkeys]:
- Items for "child", "parent", "nextchild", "nextparent","current", "work" recognises
- Values assignes in human-readble format recognised by QKeySeuence
patches attached:
[add-repoview-navkeys](/uploads/d13125683265e603c3c332ee32548ac2/add-repoview-navkeys)
[add-repoview-navkeys-cfg](/uploads/d06b782601eaf2a23dcd0b9e28f3560b/add-repoview-navkeys-cfg)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5638Randomly get two different behaviors when attempting to update to revision, f...2020-10-21T14:51:47Zteo1978Randomly get two different behaviors when attempting to update to revision, from "dirty" working directoryI have a working directory with some uncommitted changes.
I right-click on a previous revision and choose Update.
I get randomly one of the two following behaviors, sometimes one, sometimes the other:
A) In the update pop-up, the "Upd...I have a working directory with some uncommitted changes.
I right-click on a previous revision and choose Update.
I get randomly one of the two following behaviors, sometimes one, sometimes the other:
A) In the update pop-up, the "Update" button is disabled, unless I check the "Discard local changes, no backup" option
B) The Update button is enabled even if the checkbox is not checked, and if I click Update, I get a warning that there are uncommitted changes and asking me what to do: discard changes, or cancel.
Both behaviors make sense. One can argue in favour of one or the other; I haven't given much thought to which one is the best. But it certainly doesn't make sense to have sometimes one and sometimes the other; and I also don't see a good reason for preferring one under certain conditions and the other under other conditions. At some point I had the impression it depended on whether or not the uncommitted changes include added/removed files, but I am unable to reproduce the two cases at will, and I don't see a good reason why that should make a difference anyway.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5637Feature Request: add ability to specify column log width in percentage2020-10-20T04:15:03Zlong76Feature Request: add ability to specify column log width in percentage**reason:** i have 2 monitors with different resolution. when i drag tortoisehg window between monitors i should set width for columns again
please add it as glogal settings and as repository settings. thanks!**reason:** i have 2 monitors with different resolution. when i drag tortoisehg window between monitors i should set width for columns again
please add it as glogal settings and as repository settings. thanks!https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5632Installation is a pain, instructions are not complete2020-10-17T17:13:16Zteo1978Installation is a pain, instructions are not completeYou have to understand that, from a user's perspective, installation of thg (and of any other software for that matter) should be as easy as either of these:
- download a file and execute it, or
- copy and paste no more than two or three...You have to understand that, from a user's perspective, installation of thg (and of any other software for that matter) should be as easy as either of these:
- download a file and execute it, or
- copy and paste no more than two or three commands into a terminal.
If it has to be any more complicated than that, then give a reliable and easy to follow set of instructions that one can follow without having to become an expert in Python, its modules and package frameworks, and whatnot.
I don't give a damn about python, I don't want to install python 2 if I'm using python 3 or viceversa, I don't want to have to figure out how to use pip, I shouldn't even have to know that thg is made in python, that's your business, not mine.
So, now I am on a brand new laptop where I **freshly installed OpenSUSE** Tumbleweed. There I installed mercurial with zypper.
Then I googled "TortoiseHG" and clicked on the first result which led me here: https://tortoisehg.bitbucket.io/
Next I click on the big "Download" button which leads me here:
https://tortoisehg.bitbucket.io/download/linux.html
My distro (OpenSUSE) is not listed, so I read the **"From Source"** which says:
> If no package yet exists for your platform, then use the source installing method described on the [thg](https://foss.heptapod.net/mercurial/tortoisehg/thg/-/wikis/thg) page
where "the thg page" links here: https://foss.heptapod.net/mercurial/tortoisehg/thg/-/wikis/thg
It says:
> 1. Install Mercurial (consult the chart at [ReleaseNotes](/mercurial/tortoisehg/thg/-/wikis/ReleaseNotes) for version info)
> 2. Clone the TortoiseHg repository:
> 3. Symlink the thg script into your path:
Note that all the commands to copy and paste are missing, BTW.
> That is usually all you have to do
Yeah, right.
The first thing I got when trying to run the `thg` executable was an error telling me that the command `python` was not found.
I was going to install python but then realized I already have python 3.8 installed on my system, so I symlinked `/usr/bin/python3` to `/usr/bin/python`, so now the `python` command executes python 3.
At https://foss.heptapod.net/mercurial/tortoisehg/thg/-/wikis/thg it doesn't say that you should use python 2 rather than 3, it just says:
> TortoiseHg should work on Python 2.4** or later**
so python 3.8 should be fine. Also, on my older laptop I've been running thg on python 3 for months now without any issue (after a nightmare process that took me several days to get it to work after the upgrade to Ubuntu 20.04 wiped out my preexisting perfectly working older install of thg, just during the period when thg's obsolete official site had been taken down and before it was redirected to the new one - so it took me a few days to discover that thg wasn't just completely abandoned)
So again, python3 should be fine.
So now, with `python` symninked to the `python3` binary, I tried running thg again, and of course I get:
```
ModuleNotFoundError: No module named 'PyQT5'
```
I look back at https://foss.heptapod.net/mercurial/tortoisehg/thg/-/wikis/thg and it does say, at the very bottom of the page:
> We require a minimum PyQt version of 4.6
Ok, well, then first, why did you say:
> 1. Install Mercurial (consult the chart at [ReleaseNotes](/mercurial/tortoisehg/thg/-/wikis/ReleaseNotes) for version info)
> 2. Clone the TortoiseHg repository:
> 3. Symlink the thg script into your path:
>
> That is usually all you have to do
No, presumably you will usually also have to install PyQt, so that should be added to the list.
And secondly, at least give me a link or some hint about how to proceed with that.
I have no idea what PyQt is, and while I love to learn new things, I'll educate myself on the topic at another time; now I was installing TortoiseHG and I expected to be able to do so in a few minutes by just executing a handful of commands, without having to google a bunch of other things.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/1843patch cannot be decoded2020-10-11T06:07:48ZBitbucket Importerpatch cannot be decoded*Created originally on Bitbucket by [qwerty7ng (James Abiagam)](https://bitbucket.org/%7B1146d5d9-f1ee-4f10-955e-cd464c1f607e%7D/)*
~~~~
#!python
** Mercurial version (2.1.1). TortoiseHg version (2.3.1)
** Command: --nofork commit
...*Created originally on Bitbucket by [qwerty7ng (James Abiagam)](https://bitbucket.org/%7B1146d5d9-f1ee-4f10-955e-cd464c1f607e%7D/)*
~~~~
#!python
** Mercurial version (2.1.1). TortoiseHg version (2.3.1)
** Command: --nofork commit
** CWD: C:\wamp\www\cfcmain
** Encoding: cp1252
** Extensions loaded:
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (6, 1, 7601, 2, 'Service Pack 1')
** Processor architecture: x86
** Qt-4.7.4 PyQt-4.8.6
Traceback (most recent call last):
File "tortoisehg\hgqt\status.pyo", line 468, in run
File "mercurial\context.pyo", line 781, in status
File "mercurial\localrepo.pyo", line 1381, in status
File "mercurial\context.pyo", line 82, in __contains__
File "mercurial\util.pyo", line 237, in __get__
File "mercurial\context.pyo", line 64, in _manifest
File "mercurial\manifest.pyo", line 54, in read
File "mercurial\revlog.pyo", line 901, in revision
mpatchError: patch cannot be decoded
~~~~
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5365Commit of new branch with no files selected fails2020-10-11T05:58:24ZBitbucket ImporterCommit of new branch with no files selected fails*Created originally on Bitbucket by [Andrew White](https://bitbucket.org/%7B9b5b7dc3-b061-47f8-a17e-1cfd157a1ca5%7D/)*
Tortoise HG 4.3.1 OS X
Steps to reproduce:
* create new branch from command line (external to Tortoise HG) - do not ...*Created originally on Bitbucket by [Andrew White](https://bitbucket.org/%7B9b5b7dc3-b061-47f8-a17e-1cfd157a1ca5%7D/)*
Tortoise HG 4.3.1 OS X
Steps to reproduce:
* create new branch from command line (external to Tortoise HG) - do not check in
* change a file
* in TortoiseHG, deselect the changed file
* enter a commit commit
* select commit
Expected behaviour:
* no-delta branch is committed
Actual behaviour:
```
#!python
** Mercurial version (4.3.1). TortoiseHg version (4.3.1)
** Command:
** CWD: /Applications/TortoiseHg.app/Contents/Resources
** Encoding: utf-8
** Extensions loaded: graphlog, convert, strip, mq, onsub, contains
** Python version: 2.7.11 (default, Jun 4 2016, 17:10:25) [GCC 4.2.1 Compatible Apple LLVM 7.3.0 (clang-703.0.31)]
** System: Darwin xxx.xxx.xxx 16.7.0 Darwin Kernel Version 16.7.0: Thu Dec 20 21:53:35 PST 2018; root:xnu-3789.73.31~1/RELEASE_X86_64 x86_64
** Qt-4.8.6 PyQt-4.11.4 QScintilla-2.9.1
Traceback (most recent call last):
File "/Applications/TortoiseHg.app/Contents/Resources/lib/python2.7/tortoisehg/hgqt/commit.py", line 545, in mqPerformAction
File "/Applications/TortoiseHg.app/Contents/Resources/lib/python2.7/tortoisehg/hgqt/commit.py", line 1029, in commit
AssertionError
```https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5634Nonsensical error: "Could not open network socket" at startup2020-10-10T23:15:35Zteo1978Nonsensical error: "Could not open network socket" at startupEvery time I launch thg I get these errors in the terminal where I run thg from:
```
_IceTransSocketUNIXConnect: Cannot connect to non-local host localhost
_IceTransSocketUNIXConnect: Cannot connect to non-local host localhost
Qt: Sessi...Every time I launch thg I get these errors in the terminal where I run thg from:
```
_IceTransSocketUNIXConnect: Cannot connect to non-local host localhost
_IceTransSocketUNIXConnect: Cannot connect to non-local host localhost
Qt: Session management error: Could not open network socket
```
The host name of my machine happens to be "localhost", because this is a recently-installed openSUSE, and strangely enough, on installation openSUSE didn't prompt me to choose a name for the machine (I think that's stupid if you ask me), so I guess that's the default name.
I mention this just in case the confusion between "localhost" as a name for the host, as opposed to the conventional name for the loopback network interface (i.e. 127.0.0.1), is in any way related to the issue (or anyway it could lead to confusion when trying to make sense of the above error messages).https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4181Tried to commit while showing incoming2020-09-26T04:28:01ZBitbucket ImporterTried to commit while showing incoming*Created originally on Bitbucket by [NN](https://bitbucket.org/%7Bf66e4503-cb56-489c-b87b-d9fb5db1dd37%7D/)*
cmdserver: process exited unexpectedly with code 255
~~~~
** Unknown exception encountered with possibly-broken third-party...*Created originally on Bitbucket by [NN](https://bitbucket.org/%7Bf66e4503-cb56-489c-b87b-d9fb5db1dd37%7D/)*
cmdserver: process exited unexpectedly with code 255
~~~~
** Unknown exception encountered with possibly-broken third-party extension mercurial_keyring
** which supports versions unknown of Mercurial.
** Please disable mercurial_keyring and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Mercurial Distributed SCM (version 3.4)
** Extensions loaded: color, histedit, mercurial_keyring, progress, purge, rebase, shelve, strip, extdiff, reviewboard, evolve, share, tortoisehg.util.hgcommands, tortoisehg.util.partialcommit, tortoisehg.util.pipeui, tortoisehg.util.win32ill, tortoisehg.util.hgdispatch
Traceback (most recent call last):
File "hg", line 53, in <module>
File "mercurial\dispatch.pyo", line 29, in run
File "mercurial\dispatch.pyo", line 91, in dispatch
File "mercurial\dispatch.pyo", line 160, in _runcatch
File "mercurial\dispatch.pyo", line 885, in _dispatch
File "mercurial\dispatch.pyo", line 646, in runcommand
File "mercurial\dispatch.pyo", line 976, in _runcommand
File "mercurial\dispatch.pyo", line 947, in checkargs
File "mercurial\dispatch.pyo", line 882, in <lambda>
File "mercurial\util.pyo", line 716, in check
File "mercurial\commands.pyo", line 5659, in serve
File "mercurial\cmdutil.pyo", line 790, in service
File "mercurial\commandserver.pyo", line 289, in run
File "mercurial\commandserver.pyo", line 242, in serve
File "mercurial\commandserver.pyo", line 220, in serveone
File "mercurial\commandserver.pyo", line 203, in runcommand
File "mercurial\dispatch.pyo", line 91, in dispatch
File "mercurial\dispatch.pyo", line 160, in _runcatch
File "mercurial\extensions.pyo", line 164, in closure
File "tortoisehg\util\hgdispatch.pyo", line 23, in _dispatch
File "mercurial\dispatch.pyo", line 885, in _dispatch
File "mercurial\dispatch.pyo", line 646, in runcommand
File "mercurial\dispatch.pyo", line 976, in _runcommand
File "mercurial\dispatch.pyo", line 947, in checkargs
File "mercurial\dispatch.pyo", line 882, in <lambda>
File "mercurial\util.pyo", line 716, in check
File "mercurial\extensions.pyo", line 164, in closure
File "mercurial\util.pyo", line 716, in check
File "tortoisehg\util\partialcommit.pyo", line 40, in partialcommit
File "mercurial\util.pyo", line 716, in check
File "mercurial\extensions.pyo", line 164, in closure
File "mercurial\util.pyo", line 716, in check
File "hgext\evolve.pyo", line 2049, in commitwrapper
File "mercurial\util.pyo", line 716, in check
File "mercurial\extensions.pyo", line 164, in closure
File "mercurial\util.pyo", line 716, in check
File "hgext\evolve.pyo", line 595, in warnobserrors
File "mercurial\util.pyo", line 716, in check
File "mercurial\commands.pyo", line 1546, in commit
File "mercurial\cmdutil.pyo", line 2456, in commit
File "mercurial\commands.pyo", line 1540, in commitfunc
File "mercurial\localrepo.pyo", line 64, in wrapper
File "mercurial\localrepo.pyo", line 1507, in commit
File "mercurial\localrepo.pyo", line 64, in wrapper
File "mercurial\localrepo.pyo", line 1584, in commitctx
File "mercurial\manifest.pyo", line 842, in add
File "mercurial\bundlerepo.pyo", line 141, in addrevision
NotImplementedError
[Code: -1]
~~~~
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5615crash report: thg 5.5.1+6 py3 on repo conflicted by merge2020-09-26T04:09:18Zalexraynecrash report: thg 5.5.1+6 py3 on repo conflicted by mergerun thg 5.5.1+6-799ca6335d5b (Mercurial-5.4, Python-3.8.3, PyQt-5.13.2, Qt-5.13.2) on win8 py3.8 from source:
made a ordinary merge into working dir, and got crash:
```
Traceback (most recent call last):
File "D:\projects\hg\thg\thg....run thg 5.5.1+6-799ca6335d5b (Mercurial-5.4, Python-3.8.3, PyQt-5.13.2, Qt-5.13.2) on win8 py3.8 from source:
made a ordinary merge into working dir, and got crash:
```
Traceback (most recent call last):
File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\merge.py", line 404, in isComplete
for root, path, status in thgrepo.recursiveMergeStatus(self.repo):
File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\thgrepo.py", line 1138, in recursiveMergeStatus
for s in wctx.substate:
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\util.py", line 1744, in __get__
result = self.func(obj)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 174, in substate
return subrepoutil.state(self, self._repo.ui)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 59, in state
read(b'.hgsub')
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 52, in read
p.parse(f, data, sections, remap, read)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\config.py", line 210, in parse
raise error.ParseError(l.rstrip(), (b"%s:%d" % (src, line)))
mercurial.error.ParseError: (b'<<<<<<< working copy', b'.hgsub:12')
Traceback (most recent call last):
File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\merge.py", line 404, in isComplete
for root, path, status in thgrepo.recursiveMergeStatus(self.repo):
File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\thgrepo.py", line 1138, in recursiveMergeStatus
for s in wctx.substate:
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\util.py", line 1744, in __get__
result = self.func(obj)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 174, in substate
return subrepoutil.state(self, self._repo.ui)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 59, in state
read(b'.hgsub')
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 52, in read
p.parse(f, data, sections, remap, read)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\config.py", line 210, in parse
raise error.ParseError(l.rstrip(), (b"%s:%d" % (src, line)))
mercurial.error.ParseError: (b'<<<<<<< working copy', b'.hgsub:12')
Traceback (most recent call last):
File "D:\projects\hg\thg\thg.work\tortoisehg\hgqt\status.py", line 756, in run
status = self.repo.status(**stopts)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\localrepo.py", line 3336, in status
return self[node1].status(
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 426, in status
r = ctx2._buildstatus(
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 1940, in _buildstatus
s = self._dirstatestatus(match, listignored, listclean, listunknown)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 1848, in _dirstatestatus
subrepos = sorted(self.substate)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\util.py", line 1744, in __get__
result = self.func(obj)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\context.py", line 174, in substate
return subrepoutil.state(self, self._repo.ui)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 59, in state
read(b'.hgsub')
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\subrepoutil.py", line 52, in read
p.parse(f, data, sections, remap, read)
File "D:\projects\hg\thg\thg.work\venv.py38\lib\site-packages\mercurial\config.py", line 210, in parse
raise error.ParseError(l.rstrip(), (b"%s:%d" % (src, line)))
mercurial.error.ParseError: (b'<<<<<<< working copy', b'.hgsub:12')
(venv.py38) D:\projects\hg\thg\thg.work>
```
crash causes by conflicting merge .hgsub, BUT:
thg 5.5 installed from winx64 msi not crashes, and report error - propose to edit and fix config file .hgsub.
thg from source (799ca6335d5b ) - now crash at that repo open - can't show such damaged repohttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5564thg stable - error on repolist scroll2020-09-10T06:08:02Zalexraynethg stable - error on repolist scrollrun thg stable on win8:
version 5.4.1+15-ef82204dcd35
with Mercurial-5.4, Python-3.8.3, PyQt-5.13.2, Qt-5.13.2
when scrolling repository Registry window reports error on every scroll step:
```
QFont::fromString: Invalid description '(em...run thg stable on win8:
version 5.4.1+15-ef82204dcd35
with Mercurial-5.4, Python-3.8.3, PyQt-5.13.2, Qt-5.13.2
when scrolling repository Registry window reports error on every scroll step:
```
QFont::fromString: Invalid description '(empty)'
```
navigating cursor, wthout window scroll - go silenthttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5614thg 5.5-x64 annotation/history need work directory item2020-09-09T09:39:47Zalexraynethg 5.5-x64 annotation/history need work directory itemHallow! have install thg on win8 from win-x64 msi.
when invoke annotaion/hystoy on some file - have hystory without workspace item, therefore it can't show current work dir changes.Hallow! have install thg on win8 from win-x64 msi.
when invoke annotaion/hystoy on some file - have hystory without workspace item, therefore it can't show current work dir changes.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5563disturbing useless subrepo rescans2020-09-08T21:13:56Zalexraynedisturbing useless subrepo rescansHallow! use thg5.4.1 on win8
when navigating on hystory graph there is refreshing over working dir state happens - on entry ro work-copy entry, and on out from it. This refresh invokes subrepo rescans. my repo have more then 10 git subre...Hallow! use thg5.4.1 on win8
when navigating on hystory graph there is refreshing over working dir state happens - on entry ro work-copy entry, and on out from it. This refresh invokes subrepo rescans. my repo have more then 10 git subrepos, and this rescan invokes many activity.
BUT, when go out from working entry to other hystory entry, there is no need info about directory state, there only need info abut selected revision contents. Therefore ho need to invoke subrepo check (info about it is chaged contains in .hgsubstate).
imho, it could be great if disable subrepo rescans when out from work-entry to history revision.