thg issueshttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues2020-06-21T09:48:09Zhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/448complete file loss when shelving a non-ASCII7-file2020-06-21T09:48:09ZBitbucket Importercomplete file loss when shelving a non-ASCII7-file*Created originally on Bitbucket by Anonymous*
I was shelving a hunk (by the way, I really miss hunk selection on commit) of a file with "ANSI" encoding containing umlauts (code >= 0x80) and got:
{{{
#!python
** Mercurial version (...*Created originally on Bitbucket by Anonymous*
I was shelving a hunk (by the way, I really miss hunk selection on commit) of a file with "ANSI" encoding containing umlauts (code >= 0x80) and got:
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command:
** CWD: C:\Windows\System32
** Extensions loaded: fixfrozenexts, graphlog, fetch, purge, mq, churn, convert, hgk, transplant, interhg, vss, bugtrack, artemis
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (6, 0, 6001, 2, 'Service Pack 1')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\shelve.pyo", line 231, in moveChunksRight
File "tortoisehg\hgqt\chunks.pyo", line 212, in deleteSelectedChunks
UnicodeEncodeError: 'ascii' codec can't encode character u'\xe4' in position 220: ordinal not in range(128)
}}}
Furthermore, the file in question was empty afterwards, so I lost all my changes. Not having a saved revision of this file might be a common situation because otherwise there would be nothing to shelve. Therefore I think this error to be critical.
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/447Error message on commit2020-06-21T09:48:08ZBitbucket ImporterError message on commit*Created originally on Bitbucket by Anonymous*
Hi, I got this error message when committing.
Hope this helps,
-G-
-----------------------
{{{
#!python
** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues
...*Created originally on Bitbucket by Anonymous*
Hi, I got this error message when committing.
Hope this helps,
-G-
-----------------------
{{{
#!python
** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues
** Mercurial version (1.8). TortoiseHg version (2.0)
** Command: --nofork commit
** CWD: D:\Dev\proto
** Extensions loaded: fixfrozenexts
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)]
** Windows version: (6, 1, 7601, 2, 'Service Pack 1')
** Processor architecture: x64
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\commit.pyo", line 608, in commandFinished
File "tortoisehg\hgqt\commit.pyo", line 449, in addMessageToHistory
ValueError: list.remove(x): x not in list
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/446Visual diff of incoming changesets crashes2020-06-21T09:48:07ZBitbucket ImporterVisual diff of incoming changesets crashes*Created originally on Bitbucket by [sborho (Steve Borho)](https://bitbucket.org/%7Ba7b33259-0b76-44e3-9ee3-0946c696a082%7D/)*
{{{
#!python
** Mercurial version (1.8.1+48-913c2c66a555). TortoiseHg version (2.0.2+102-de756a7ca8d8)
**...*Created originally on Bitbucket by [sborho (Steve Borho)](https://bitbucket.org/%7Ba7b33259-0b76-44e3-9ee3-0946c696a082%7D/)*
{{{
#!python
** Mercurial version (1.8.1+48-913c2c66a555). TortoiseHg version (2.0.2+102-de756a7ca8d8)
** Command:
** CWD: C:\Windows\system32
** Extensions loaded: fixfrozenexts, mercurial_keyring, purge, perfarce, mq
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)]
** Windows version: (6, 1, 7600, 2, '')
** Processor architecture: x64
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\filelistview.pyo", line 143, in vdiff
File "tortoisehg\hgqt\visdiff.pyo", line 180, in visualdiff
File "mercurial\localrepo.pyo", line 206, in __getitem__
File "mercurial\context.pyo", line 25, in __init__
File "mercurial\revlog.pyo", line 312, in node
IndexError: list index out of range
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/445Can't select which changeset to push2020-06-21T09:48:06ZBitbucket ImporterCan't select which changeset to push*Created originally on Bitbucket by Anonymous*
The push always tries to push all change sets. I can't get it to push a subset of change sets.
The work around is to use the hg command line to execute the push.
*Created originally on Bitbucket by Anonymous*
The push always tries to push all change sets. I can't get it to push a subset of change sets.
The work around is to use the hg command line to execute the push.
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/443Commit window should display progress while committing2020-06-21T09:48:04ZBitbucket ImporterCommit window should display progress while committing*Created originally on Bitbucket by Anonymous*
In the commit window, when I run commit, the buttons don't disable and there is no other UI suggestion than anything is actually happening when I push commit. This is only a problem when I ...*Created originally on Bitbucket by Anonymous*
In the commit window, when I run commit, the buttons don't disable and there is no other UI suggestion than anything is actually happening when I push commit. This is only a problem when I commit large things. It would be nice to have some kind of progress indicator display while operations are taking place in the background.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/442Shelve tool doesn't work with eol extension2020-06-21T09:48:03ZBitbucket ImporterShelve tool doesn't work with eol extension*Created originally on Bitbucket by [ccaughie (Colin Caughie)](https://bitbucket.org/%7B9959ebea-5ce8-4ee1-aaac-1e9233f0aca5%7D/)*
This is similar to issue 276, but happens specifically when you are using the eol extension to translate ...*Created originally on Bitbucket by [ccaughie (Colin Caughie)](https://bitbucket.org/%7B9959ebea-5ce8-4ee1-aaac-1e9233f0aca5%7D/)*
This is similar to issue 276, but happens specifically when you are using the eol extension to translate line endings. While 276 was apparently fixed in 2.0.1, this one is still a problem (and is actually worse because the only known workaround no longer works) in 2.0.2.
In my case we have a repository with LF line endings but use native line endings in the work area. I.e. the .hgeol file looks like this:
{{{
[patterns]
** = native
[repository]
native = LF
}}}
In this case unshelve (using thg) //always// fails. Adding "eol=auto" to mercurial.ini makes no difference in 2.0.2, although I'm pretty sure this fixed it in 2.0. (It shouldn't make a difference of course, since the eol extension automatically sets patch.eol=auto when it is loaded).
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/441Refactor "Reorder Unapplied Patches" feature2020-06-21T09:48:01ZBitbucket ImporterRefactor "Reorder Unapplied Patches" feature*Created originally on Bitbucket by [regent (Eugene Baranov)](https://bitbucket.org/%7Bbd52f1e4-0642-4203-8ddc-0c483c962b11%7D/)*
Currently in order to reorder MQ patches "Reorder Unapplied Patches" dialog (right-click - "Reorder patche...*Created originally on Bitbucket by [regent (Eugene Baranov)](https://bitbucket.org/%7Bbd52f1e4-0642-4203-8ddc-0c483c962b11%7D/)*
Currently in order to reorder MQ patches "Reorder Unapplied Patches" dialog (right-click - "Reorder patches...") should be used.
IMHO I think having a separate dialog window for that is wasteful and also it would much move convenient to have two "Move patch up" and "Move patch down" context items instead of "Reorder patches...".https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/440HOME key in workbench2020-06-21T09:48:00ZBitbucket ImporterHOME key in workbench*Created originally on Bitbucket by Anonymous*
For an intuitive navigation it would be nice if the HOME and END keys would work in the revision log and the file lists of the workbench. - Just like the ARROW/PAGE UP/DOWN keys which alrea...*Created originally on Bitbucket by Anonymous*
For an intuitive navigation it would be nice if the HOME and END keys would work in the revision log and the file lists of the workbench. - Just like the ARROW/PAGE UP/DOWN keys which already work fine.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/439Update to another branch crash with crashreport2020-06-21T09:47:59ZBitbucket ImporterUpdate to another branch crash with crashreport*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command:
** CWD: C:\Dokumente und Einstellungen\Thilo.Elzer
** Extensions loaded: fixfrozenexts, mq, extdiff,...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command:
** CWD: C:\Dokumente und Einstellungen\Thilo.Elzer
** Extensions loaded: fixfrozenexts, mq, extdiff, purge
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 1, 2600, 2, 'Service Pack 3')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\repowidget.pyo", line 1188, in updateToRevision
File "tortoisehg\hgqt\update.pyo", line 154, in __init__
File "tortoisehg\hgqt\update.pyo", line 159, in update_info
File "tortoisehg\hgqt\csinfo.pyo", line 441, in update
File "tortoisehg\hgqt\csinfo.pyo", line 340, in update
File "tortoisehg\hgqt\thgrepo.pyo", line 243, in changectx
File "genericpath.pyo", line 29, in isfile
TypeError: stat() argument 1 must be encoded string without NULL bytes, not str
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/438Unable to multi-select in patch queue2020-06-21T09:47:58ZBitbucket ImporterUnable to multi-select in patch queue*Created originally on Bitbucket by [seanare](https://bitbucket.org/%7Ba1c131d4-4471-4e7c-ace6-f0e977404c41%7D/)*
It may be a case of PEBCAK, but I can't seem to select multiple patches in the left-hand pane which lists the patches when...*Created originally on Bitbucket by [seanare](https://bitbucket.org/%7Ba1c131d4-4471-4e7c-ace6-f0e977404c41%7D/)*
It may be a case of PEBCAK, but I can't seem to select multiple patches in the left-hand pane which lists the patches when "Patch Queue" is selected.
Based on my experience with thg 1.1.9, and the use of the plural in the tooltip for the Delete Patch button (being "Delete selected patches"), I presume that it is intended that multiple selection should be available (if not this should be an enhancement issue).
When a patch is selected, using any of ctrl-click, shift-click, or holding down shift and using the arrow keys, to select an additional patch, instead causes a different (single) patch to be selected.
{{{
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Extensions loaded: fixfrozenexts, mq, rebase, extdiff, fetch, histedit, transplant, graphlog
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 1, 2600, 2, 'Service Pack 3')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
}}}
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/437revset editor: not obvious how to trigger a query2020-06-21T09:47:57ZBitbucket Importerrevset editor: not obvious how to trigger a query*Created originally on Bitbucket by [bels (Stephen Belknap)](https://bitbucket.org/%7B3e8e7e8e-fe62-4032-a93f-8329955ee1ac%7D/)*
When I first had the Revision Set Query window opened, I didn't understand how to actually run the query. E...*Created originally on Bitbucket by [bels (Stephen Belknap)](https://bitbucket.org/%7B3e8e7e8e-fe62-4032-a93f-8329955ee1ac%7D/)*
When I first had the Revision Set Query window opened, I didn't understand how to actually run the query. Eventually I figured out hitting enter (and not the keypad one) runs it.
It would be nice to make that much more obvious, either by having an Execute button.
Even better would be to have a double-click run the query as-given in the text area.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/436Close the query area when clicking X if no query entered2020-06-21T09:47:56ZBitbucket ImporterClose the query area when clicking X if no query entered*Created originally on Bitbucket by [bels (Stephen Belknap)](https://bitbucket.org/%7B3e8e7e8e-fe62-4032-a93f-8329955ee1ac%7D/)*
Currently, to toggle the query area from showing/not showing, one must click the magnifying glass button.
...*Created originally on Bitbucket by [bels (Stephen Belknap)](https://bitbucket.org/%7B3e8e7e8e-fe62-4032-a93f-8329955ee1ac%7D/)*
Currently, to toggle the query area from showing/not showing, one must click the magnifying glass button.
It may be nicer to have the X button that clears the query text field also close it if it is already empty.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/435Move the cancel query button to right2020-06-21T09:47:55ZBitbucket ImporterMove the cancel query button to right*Created originally on Bitbucket by [bels (Stephen Belknap)](https://bitbucket.org/%7B3e8e7e8e-fe62-4032-a93f-8329955ee1ac%7D/)*
The mouse interaction for using the revset query language are all to the right of the query text field (spe...*Created originally on Bitbucket by [bels (Stephen Belknap)](https://bitbucket.org/%7B3e8e7e8e-fe62-4032-a93f-8329955ee1ac%7D/)*
The mouse interaction for using the revset query language are all to the right of the query text field (specifically the drop down). Therefore, it makes much more sense for the red X button to be over there as well.
Otherwise, it forces a lot of back-and-forth mouse movements to cancel a past-run query.
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/434Add ability to have favorite filters2020-06-21T09:47:54ZBitbucket ImporterAdd ability to have favorite filters*Created originally on Bitbucket by [bels (Stephen Belknap)](https://bitbucket.org/%7B3e8e7e8e-fe62-4032-a93f-8329955ee1ac%7D/)*
In the older version of THg, I found myself increasingly relying on the various radio buttons (usually I sw...*Created originally on Bitbucket by [bels (Stephen Belknap)](https://bitbucket.org/%7B3e8e7e8e-fe62-4032-a93f-8329955ee1ac%7D/)*
In the older version of THg, I found myself increasingly relying on the various radio buttons (usually I switched between All, Heads and the branch filter drop down).
With the new Qt version you can filter and get the same results, but it is more steps and less easy to do.
It would be really nice to add an ability to have favorite filters. This could be very similar to say how bookmarks work in webpages. For the feature itself, perhaps clicking the ... button could pop up a menu whereby you some number of favorite queries, perhaps another submenu for more of them, and finally an action for creating one.
Probably the Revision Set Query dialog could then provide some functionality for saving the query, editing previous queries, etc
This query functionality looks to have replaced a lot of the other more manual UI features as it is much more powerful. I then think it advantageous to build out the UI to support more of these queries similar to browser bookmarks/favorites.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/433visdiff: UnicodeEncodeError: 'ascii' codec can't encode character u'\xed'2020-06-21T09:47:52ZBitbucket Importervisdiff: UnicodeEncodeError: 'ascii' codec can't encode character u'\xed'*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork vdiff
** CWD: R:\VFPjobs\REVIDA\PROV09
** Extensions loaded: fixfrozenexts
** Python versio...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork vdiff
** CWD: R:\VFPjobs\REVIDA\PROV09
** Extensions loaded: fixfrozenexts
** 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.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\run.pyo", line 469, in __call__
File "tortoisehg\hgqt\visdiff.pyo", line 612, in run
File "tortoisehg\hgqt\visdiff.pyo", line 348, in visualdiff
File "tortoisehg\hgqt\visdiff.pyo", line 342, in dodiffwrapper
File "tortoisehg\hgqt\visdiff.pyo", line 331, in dodiff
File "tortoisehg\hgqt\visdiff.pyo", line 134, in launchtool
File "subprocess.pyo", line 623, in __init__
File "subprocess.pyo", line 833, in _execute_child
UnicodeEncodeError: 'ascii' codec can't encode character u'\xed' in position 89: ordinal not in range(128)
}}}
*Attachments:* [new_exception](/uploads/e19853c5a2900378cb1ddbdcf7b5af28/new_exception.png)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/432crash when moving repo in repo registry2020-06-21T09:47:50ZBitbucket Importercrash when moving repo in repo registry*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork workbench
** CWD: D:\ezsoft\tools internal\ACLiaison\.hg\patches
** Extensions loaded: fixfr...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork workbench
** CWD: D:\ezsoft\tools internal\ACLiaison\.hg\patches
** Extensions loaded: fixfrozenexts, mq, rebase, graphlog, convert, prompt
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (6, 1, 7600, 2, '')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\repotreemodel.pyo", line 184, in dropMimeData
AttributeError: 'NoneType' object has no attribute 'insertChild'
}}}
I was dragging a repo from the default group to the end of another group. My aim may have been off, but I was pretty sure I saw the insert line at the end of that group.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/431Query button on security dialog hardcoded to :4432020-06-21T09:47:49ZBitbucket ImporterQuery button on security dialog hardcoded to :443*Created originally on Bitbucket by [txcraig](https://bitbucket.org/%7B108b7f12-ecde-4daa-b5ea-30c476c86e82%7D/)*
From https://bitbucket.org/tortoisehg/thg/issue/264/crash-on-pressing-query-button-in-security I can see that :443 is hard...*Created originally on Bitbucket by [txcraig](https://bitbucket.org/%7B108b7f12-ecde-4daa-b5ea-30c476c86e82%7D/)*
From https://bitbucket.org/tortoisehg/thg/issue/264/crash-on-pressing-query-button-in-security I can see that :443 is hardcoded in genfingerprint -> https://bitbucket.org/tortoisehg/thg/changeset/70cb77d81e05 .
Our Mercurial server necessarily uses an alternate port number for SSL, therefore when I click 'Query' on the Security dialog, it cannot get the host fingerprint. It seems like the security dialog should use the portnumber from the remote repository specified on the previous Sync dialog, rather than hardcoding :443. Thanks in advance for considering this bug.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/430Crash on commit2020-06-21T09:47:48ZBitbucket ImporterCrash on commit*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork commit
** CWD: C:\WINCE600
** Extensions loaded: fixfrozenexts
** Python version: 2.6.6 (r2...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork commit
** CWD: C:\WINCE600
** Extensions loaded: fixfrozenexts
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 1, 2600, 2, 'Service Pack 3')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\thread.pyo", line 265, in run
TypeError: sequence item 6: expected string, QString found
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/429Crash while pull with post pull: rebase2020-06-21T09:47:47ZBitbucket ImporterCrash while pull with post pull: rebase*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork workbench
** CWD: F:\Tunis\dev
** Extensions loaded: fixfrozenexts, mercurial_keyring, fetch...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Mercurial version (1.8.1). TortoiseHg version (2.0.2)
** Command: --nofork workbench
** CWD: F:\Tunis\dev
** Extensions loaded: fixfrozenexts, mercurial_keyring, fetch, transplant, rebase, mq
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 1, 2600, 2, 'Service Pack 3')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 402, in data
File "tortoisehg\hgqt\repomodel.pyo", line 311, in graphctx
File "mercurial\context.pyo", line 112, in branch
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 433, in rawdata
File "mercurial\context.pyo", line 112, in branch
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 481, in getbranch
File "mercurial\context.pyo", line 112, in branch
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\htmldelegate.pyo", line 31, in paint
File "tortoisehg\hgqt\htmldelegate.pyo", line 57, in _builddoc
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 518, in getlog
File "tortoisehg\hgqt\thgrepo.pyo", line 551, in longsummary
File "mercurial\context.pyo", line 110, in description
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 430, in rawdata
File "mercurial\context.pyo", line 104, in user
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 506, in getauthor
File "mercurial\context.pyo", line 104, in user
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 96, in <lambda>
File "mercurial\context.pyo", line 106, in date
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 97, in <lambda>
File "mercurial\context.pyo", line 106, in date
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 402, in data
File "tortoisehg\hgqt\repomodel.pyo", line 311, in graphctx
File "mercurial\context.pyo", line 112, in branch
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 433, in rawdata
File "mercurial\context.pyo", line 112, in branch
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 481, in getbranch
File "mercurial\context.pyo", line 112, in branch
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\htmldelegate.pyo", line 31, in paint
File "tortoisehg\hgqt\htmldelegate.pyo", line 57, in _builddoc
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 518, in getlog
File "tortoisehg\hgqt\thgrepo.pyo", line 551, in longsummary
File "mercurial\context.pyo", line 110, in description
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 430, in rawdata
File "mercurial\context.pyo", line 104, in user
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 506, in getauthor
File "mercurial\context.pyo", line 104, in user
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 96, in <lambda>
File "mercurial\context.pyo", line 106, in date
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 97, in <lambda>
File "mercurial\context.pyo", line 106, in date
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 97, in <lambda>
File "mercurial\context.pyo", line 106, in date
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 409, in data
File "tortoisehg\hgqt\repomodel.pyo", line 421, in rawdata
File "tortoisehg\hgqt\repomodel.pyo", line 97, in <lambda>
File "mercurial\context.pyo", line 106, in date
File "mercurial\util.pyo", line 169, in __get__
File "mercurial\context.pyo", line 59, in _changeset
File "mercurial\changelog.pyo", line 173, in read
File "mercurial\bundlerepo.pyo", line 121, in revision
File "mercurial\revlog.pyo", line 870, in revision
File "mercurial\bundlerepo.pyo", line 86, in _chunk
File "mercurial\revlog.pyo", line 804, in _chunk
File "mercurial\revlog.pyo", line 117, in decompress
error: Error -5 while decompressing data: incomplete or truncated stream
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/428Merge conflict dialog unclear2020-06-21T09:47:46ZBitbucket ImporterMerge conflict dialog unclear*Created originally on Bitbucket by Anonymous*
The new merge conflict dialog as of 2.0 is totally unclear. I don't understand what auto resolve means and when I click manual resolve the diff viewer doesn't show. The viewer only seems to...*Created originally on Bitbucket by Anonymous*
The new merge conflict dialog as of 2.0 is totally unclear. I don't understand what auto resolve means and when I click manual resolve the diff viewer doesn't show. The viewer only seems to show when I select all files and click "Manual resolve" on all of them.
The entire dialog is very confusing.