thg issueshttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues2020-06-21T10:57:21Zhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4352shelve: uncommitted merge with no revision specified2020-06-21T10:57:21ZBitbucket Importershelve: uncommitted merge with no revision specified*Created originally on Bitbucket by Anonymous*
I was merging two branches, but have not committed the merge yet. I need to revert some of the changes.
In the shelf tool, I tried to delete all the changed chunks.
I was asked if I w...*Created originally on Bitbucket by Anonymous*
I was merging two branches, but have not committed the merge yet. I need to revert some of the changes.
In the shelf tool, I tried to delete all the changed chunks.
I was asked if I wanted to revert the file, I agreed, and got this error:
#!python
** Mercurial version (3.6+20151109). TortoiseHg version (3.6)
** Command: --nofork workbench
** CWD: D:\repos\auto-importer
** Encoding: cp1256
** Extensions loaded: rebase, convert, strip, mq
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\shelve.pyo", line 262, in deleteChunksA
File "tortoisehg\hgqt\chunks.pyo", line 283, in deleteSelectedChunks
File "mercurial\commands.pyo", line 5772, in revert
Abort: uncommitted merge with no revision specified
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4343unicode error in customtools settings2020-06-21T10:57:12ZBitbucket Importerunicode error in customtools settings*Created originally on Bitbucket by [ArthurM](https://bitbucket.org/%7B670ea38f-f24f-44c1-88c6-2ff89ce7a942%7D/)*
#!python
** Mercurial version (3.5.2). TortoiseHg version (3.5.2)
** Command: --nofork workbench
** CW...*Created originally on Bitbucket by [ArthurM](https://bitbucket.org/%7B670ea38f-f24f-44c1-88c6-2ff89ce7a942%7D/)*
#!python
** Mercurial version (3.5.2). TortoiseHg version (3.5.2)
** Command: --nofork workbench
** CWD: D:\workspace
** Encoding: cp1252
** Extensions loaded: strip, mq
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\customtools.pyo", line 670, in okClicked
File "tortoisehg\hgqt\customtools.pyo", line 814, in validateForm
File "tortoisehg\hgqt\customtools.pyo", line 802, in value
UnicodeEncodeError: 'ascii' codec can't encode character u'\xed' in position 1: ordinal not in range(128)
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4335Configure Local Time Column2020-06-21T10:57:00ZBitbucket ImporterConfigure Local Time Column*Created originally on Bitbucket by Anonymous*
It would be nice to able to configure the Local Time Column to be displayed in a different format let's say"
DayOfWeek hh:mm:ss
or
dd-MM-yy hh:mm:ss*Created originally on Bitbucket by Anonymous*
It would be nice to able to configure the Local Time Column to be displayed in a different format let's say"
DayOfWeek hh:mm:ss
or
dd-MM-yy hh:mm:sshttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4333gui refresh very slow despite hgwatchman2020-06-21T10:56:56ZBitbucket Importergui refresh very slow despite hgwatchman*Created originally on Bitbucket by Anonymous*
hello
I have hgwatchman working on my system (windows 7 64 bits).
The speed of command-line 'hg status' has much improved (down to 2 seconds from the original 23 for a very big repo with ...*Created originally on Bitbucket by Anonymous*
hello
I have hgwatchman working on my system (windows 7 64 bits).
The speed of command-line 'hg status' has much improved (down to 2 seconds from the original 23 for a very big repo with tons of files).
Still, the gui refresh is very slow. It looks like tortoisehg is not able to use the hgwatchman extension for gui status updates.
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4328Workbench painfully slow, help needed to diagnose it2020-06-21T10:56:50ZBitbucket ImporterWorkbench painfully slow, help needed to diagnose it*Created originally on Bitbucket by [steve-spencer (Steve Spencer)](https://bitbucket.org/%7Bd69f41bc-9c67-429f-a8e9-56732ec7198e%7D/)*
We use TortoiseHg 3.5.1 on Windows, Linux and Mac.
Our repo has ~90,000 commits, and uses the lar...*Created originally on Bitbucket by [steve-spencer (Steve Spencer)](https://bitbucket.org/%7Bd69f41bc-9c67-429f-a8e9-56732ec7198e%7D/)*
We use TortoiseHg 3.5.1 on Windows, Linux and Mac.
Our repo has ~90,000 commits, and uses the largefiles extensions.
repo/.hg is 3gb (not counting largefiles cache)
working copy at tip (including all largefiles for that rev) is 60,000 files and 2.3gb. Not sure how many of those are large; the progress indicator on update from null showed about "nnnnn/50000" if that's any use. 99.9% of commits concern regular files only.
All on SSDs on fast 32gb ram / 6 core i7 desktops.
Regular operations (pull, update, commit, merge, change branch filter) freeze the UI for several seconds.
So for example if you do something wrong and need to rollback and re-commit, it's a round trip of about 30 seconds or more.
I've hunted around other bug reports for tips on profiling this so I can identify the bottleneck, but can't find any. Please could you give me some pointers to diagnose/profile this on Windows?https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4323View patch in external tool2020-06-21T10:56:45ZBitbucket ImporterView patch in external tool*Created originally on Bitbucket by [psuter (Peter Suter)](https://bitbucket.org/%7B48b289e8-68dd-4aa4-8d3a-6458c5363d69%7D/)*
TortoiseHG has options to specify external tools for three-way merging, visual diff viewing etc.
I use Bey...*Created originally on Bitbucket by [psuter (Peter Suter)](https://bitbucket.org/%7B48b289e8-68dd-4aa4-8d3a-6458c5363d69%7D/)*
TortoiseHG has options to specify external tools for three-way merging, visual diff viewing etc.
I use Beyond Compare 4 for these. Beyond Compare 4 can also visualize patch files. But TortoiseHG does not offer to view patches in an external tool. Unapplied MQ patches should have a context menu entry to view the patch in the configured external tool.
Thankshttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4321Moving a group in the Repo Registry into another group caused AttributeError2020-06-21T10:56:43ZBitbucket ImporterMoving a group in the Repo Registry into another group caused AttributeError*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (3.4.2). TortoiseHg version (3.4.2)
** Command:
** CWD: C:\Windows\system32
** Encoding: cp1252
** Extensions loaded: hgsubversi...*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (3.4.2). TortoiseHg version (3.4.2)
** Command:
** CWD: C:\Windows\system32
** Encoding: cp1252
** Extensions loaded: hgsubversion, convert, record, shelve, extdiff, strip, mq, purge
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\repotreemodel.pyo", line 148, in parent
AttributeError: 'NoneType' object has no attribute 'row'https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4319Bisect dialog good/bad revision input validation is too strict (blocks syntax...2020-06-21T10:56:41ZBitbucket ImporterBisect dialog good/bad revision input validation is too strict (blocks syntaxes that plain hg accepts)*Created originally on Bitbucket by [gstefanik (Gábor Stefanik)](https://bitbucket.org/%7B200d976e-c2ee-416e-a514-753081dccdce%7D/)*
THg's Bisect dialog overzealously validates the entered good/bad revisions, rejecting valid inputs for ...*Created originally on Bitbucket by [gstefanik (Gábor Stefanik)](https://bitbucket.org/%7B200d976e-c2ee-416e-a514-753081dccdce%7D/)*
THg's Bisect dialog overzealously validates the entered good/bad revisions, rejecting valid inputs for "hg bisect -g" and "hg bisect -b".
E.g. "hg bisect -g ancestor(0)" is valid and will mark the revision 0 as good (ancestor(0) is synonymous with 0), but entering ancestor(0) in the GUI Bisect dialog produces "unknown revision 'ancestor(0)'". This is a silly example, but someone may likewise want to use a date() predicate to specify a revision, which works on the console, but not in the GUI.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4316Author color should be based on email account and not to all string2020-06-21T10:56:37ZBitbucket ImporterAuthor color should be based on email account and not to all string*Created originally on Bitbucket by [Pasquale Dante](https://bitbucket.org/%7Bbd98781b-4d73-4d04-9491-6e97bcee6ec9%7D/)*
In my company, we use MQ. When I import some patches from someone that hasn't specified his name, I edit MQ option ...*Created originally on Bitbucket by [Pasquale Dante](https://bitbucket.org/%7Bbd98781b-4d73-4d04-9491-6e97bcee6ec9%7D/)*
In my company, we use MQ. When I import some patches from someone that hasn't specified his name, I edit MQ option via thg GUI.
In some case I adds some blank (for example luca <xxx@yyy.it> instead of luca <xxx@yyy.it>) and thg show different colors for the same author.
I have attached a screenshot to show behavior in action.
Thanks in advance.
*Attachments:* [behavior](/uploads/07a0f603b14f722fb71e06ae7bfc1450/behavior.png)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4313reporegistory: disable Open for deleted repository, add re-clone from remote2020-06-21T10:56:33ZBitbucket Importerreporegistory: disable Open for deleted repository, add re-clone from remote*Created originally on Bitbucket by [tin-pot (Martin Hofmann)](https://bitbucket.org/%7B3803f196-2e39-455b-9fa0-4d1d6c6c6459%7D/)*
See
https://bitbucket.org/tortoisehg/thg/issues/4313/#comment-22280927
----
Original text:
The ...*Created originally on Bitbucket by [tin-pot (Martin Hofmann)](https://bitbucket.org/%7B3803f196-2e39-455b-9fa0-4d1d6c6c6459%7D/)*
See
https://bitbucket.org/tortoisehg/thg/issues/4313/#comment-22280927
----
Original text:
The _Repository Registry_ pane in the Workbench of TortoiseHg is a
really nice way to keep track of one's Hg repositories, alleviating
the need to remember where they all are, or to manually seek for these
repositories in the file system, using eg Windows Explorer.
Consider however the following (IMO rather typical) **scenario**:
A developer wants to make some changes to a repository of her, which is
hosted on a remote server (think Bitbucket et al). She gets a clone down
from the host to the local filesystem to start working on the code.
When finished, she commits her changes, pushes them back to the remote
repository, and - because there's no more need for the local clone -
wipes the working repository from the disk.
Now the _Repository Registry_ in fact *does* remember there was this
local repository long after it's gone, and shows it in its pane.
However: All the items in the pane look the same. The only way to detect
if a repository actually still exists (in the file system) is to try one
of the commands provided eg in the context menu: _Explore_, _Open_, etc.
If there is no actual repository, the effect depends on the command:
_Open_ gives an appropriate error message box, _Explore_ just does
nothing, etc.
I'd like to think that improvements like the following would be really
useful:
----
- Wouldn't it be nice if one could see at first glance which of the
repositories listed in the _Repostory Registry_ *do* still exist in
the file system? For example, the hint could be a different icon, or
a greyed-out item, or an italic font etc.
- Wouldn't it be nice if the _Repository Registry_ would offer only
these commands (ie enable them in the context menu) which are
applicable to a non-existing repository? I think that would be _Copy
Path_, _Rename_, and _Remove from Registry_.
- Wouldn't it be nice if the _Repository Registry_ would also remember
where a repository was cloned *from*, even beyond that repositories
lifetime? In the scenario above, if the developer wants to work on
the remote repostitory again the next time, the URL to clone from
(pointing to the remote host) would still be there right in the
_Repository Registry_
---
So the Workbench could scan (in the file system) for non-existing
repositories listed in the _Repository Registry_ and mark them
appropriately, adapting the enabled commands in the context menu or
elsewhere for the missing ones. The _Clone_ item would probably be
better *enabled*, because the subsequent _Clone_ dialog box would be the
perfect place to fill in the remembered remote URL, if there is one. So
re-cloning a "remembered" repository would only require hitting _Clone_
in that dialog.
Looking for a handful of directories in the local files system should
be really quick, unless a remembered repository path points to a drive
that is no longer mounted (a USB stick, say), which could take longer
to detect - I'm not sure. Restricting the scan for directories to file
systems that are fast and available from the start should avoid problems
in this area (eg do not search on a `A:` floppy disk drive ;-).
Depending on the amount of information the _Repository Registry_
keeps about each repository, a _Properties_ dialog box might also be
helpful, because the only way -as far as I can tell - to *see* the
path to a "registered" repository now is to either try and access it
(_Open_/_Explore_/_Terminal_) or to invoke _Copy Path_ and paste the
path somewhere in order to *read* it. A remembered URL would lead to
similar questions.
What do you think about this?
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4311Export bundle rev and descendants produce bundle without .hg extension2020-06-21T10:56:31ZBitbucket ImporterExport bundle rev and descendants produce bundle without .hg extension*Created originally on Bitbucket by Anonymous*
Export bundle rev and descendants .. produce bundle without default extension .hg
*Created originally on Bitbucket by Anonymous*
Export bundle rev and descendants .. produce bundle without default extension .hg
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4307shellext: Hide "Hg Clone..." etc on versioned directories2020-06-21T10:56:23ZBitbucket Importershellext: Hide "Hg Clone..." etc on versioned directories*Created originally on Bitbucket by [tin-pot (Martin Hofmann)](https://bitbucket.org/%7B3803f196-2e39-455b-9fa0-4d1d6c6c6459%7D/)*
Not a big deal, but a distraction nevertheless: If the "Hg Clone..." or "Hg Create Repository Here..." it...*Created originally on Bitbucket by [tin-pot (Martin Hofmann)](https://bitbucket.org/%7B3803f196-2e39-455b-9fa0-4d1d6c6c6459%7D/)*
Not a big deal, but a distraction nevertheless: If the "Hg Clone..." or "Hg Create Repository Here..." items are included in the Explorer Extensions Settings, these items get shown in the context menu even if the respective directory *already contains* a Hg repository. The little turtle's siblings TortoiseSVN and TortoiseGit sensibliy hide these items in that case, and so should TortoiseHg IMO. (Items like "Hg Commit..." are suppressed on non-versioned directories, so TortoiseHg does take the difference into account already.)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4303Escape comma ',' in deadbranch2020-06-21T10:56:19ZBitbucket ImporterEscape comma ',' in deadbranch*Created originally on Bitbucket by Anonymous*
Hi everyone,
We would like to use deadbranch feature in our development but we are stuck because we use some commas in our names and comma is brach separator... Could you just provide a wa...*Created originally on Bitbucket by Anonymous*
Hi everyone,
We would like to use deadbranch feature in our development but we are stuck because we use some commas in our names and comma is brach separator... Could you just provide a way to escape comma ? Like providing its Unicode code \u002C or something else ?
Our boss forces us to use name with at most 30 characters because large branch names in interface bore her...
Many thanks.
Thibault Drevon.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4302[Synchronize]Detect outgoing changes but "No outgoing changes" when push it.2020-06-21T10:56:18ZBitbucket Importer[Synchronize]Detect outgoing changes but "No outgoing changes" when push it.*Created originally on Bitbucket by [zaazbb](https://bitbucket.org/%7B51533f10-eb2b-441e-9875-387b73e57894%7D/)*
I want sync my bitbucket repository to github, so i add two path,
```
#!text
[paths]
default = https://zaazbb@bitbu...*Created originally on Bitbucket by [zaazbb](https://bitbucket.org/%7B51533f10-eb2b-441e-9875-387b73e57894%7D/)*
I want sync my bitbucket repository to github, so i add two path,
```
#!text
[paths]
default = https://zaazbb@bitbucket.org/zaazbb/tkinter_demo
github = git+ssh://git@github.com/zaazbb/tkinter_demo.git
```
in synchronize window, select github path, click "Detect outgoing changes" button, it can detect outgoing changes, but click "Push outgoing changes", it says "No outgoing changes".
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4297Issue when using tortoisehg shelve2020-06-21T10:56:12ZBitbucket ImporterIssue when using tortoisehg shelve*Created originally on Bitbucket by [gomarkets development](https://bitbucket.org/%7B7dd193d4-3527-4cc0-bba5-9735aa9b5900%7D/)*
#!python
** Mercurial version (3.0.2). TortoiseHg version (3.0.2)
** Command:
** CWD: C...*Created originally on Bitbucket by [gomarkets development](https://bitbucket.org/%7B7dd193d4-3527-4cc0-bba5-9735aa9b5900%7D/)*
#!python
** Mercurial version (3.0.2). TortoiseHg version (3.0.2)
** Command:
** CWD: C:\wamp\www\gomarkets-unity
** Encoding: cp1252
** Extensions loaded: strip
** Python version: 2.7.6 (default, Nov 10 2013, 19:24:24) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.5 PyQt-4.10.3 QScintilla-2.7.2
Traceback (most recent call last):
File "tortoisehg\hgqt\shelve.pyo", line 445, in refreshCombos
File "tortoisehg\hgqt\shelve.pyo", line 465, in comboAChanged
File "tortoisehg\hgqt\chunks.pyo", line 453, in setContext
File "mercurial\context.pyo", line 959, in files
File "mercurial\util.pyo", line 287, in __get__
File "mercurial\context.pyo", line 926, in _status
File "mercurial\localrepo.pyo", line 1572, in status
File "mercurial\lock.pyo", line 143, in release
File "mercurial\localrepo.pyo", line 1101, in unlock
File "mercurial\dirstate.pyo", line 510, in write
File "mercurial\util.pyo", line 882, in close
File "mercurial\windows.pyo", line 289, in rename
File "mercurial\win32.pyo", line 450, in unlink
WindowsError: [Error 32] The process cannot access the file because it is being used by another process
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4295MQ: QRefresh stays active after Finish patch2020-06-21T10:56:10ZBitbucket ImporterMQ: QRefresh stays active after Finish patch*Created originally on Bitbucket by [psuter (Peter Suter)](https://bitbucket.org/%7B48b289e8-68dd-4aa4-8d3a-6458c5363d69%7D/)*
In the workbench commit tab there's the Commit / Amend / QNew / QRefresh split button. When a patch is applie...*Created originally on Bitbucket by [psuter (Peter Suter)](https://bitbucket.org/%7B48b289e8-68dd-4aa4-8d3a-6458c5363d69%7D/)*
In the workbench commit tab there's the Commit / Amend / QNew / QRefresh split button. When a patch is applied the QRefresh mode is usually active. When the patch is turned into a commit with "Finish Patch", it should switch from QRefresh to Commit (or QNew). QRefresh doesn't make sense anymore.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4290unified diff viewer of all files (from root)2020-06-21T10:56:04ZBitbucket Importerunified diff viewer of all files (from root)*Created originally on Bitbucket by [marutosi (Toshi MARUYAMA)](https://bitbucket.org/%7B8b2953f5-8dde-4e99-acb6-7be12b73a284%7D/)*
hgtk has "All Files" diff viewer.
thg 3.5 has "directory" diff viewer.
But we cannot see "All Files" d...*Created originally on Bitbucket by [marutosi (Toshi MARUYAMA)](https://bitbucket.org/%7B8b2953f5-8dde-4e99-acb6-7be12b73a284%7D/)*
hgtk has "All Files" diff viewer.
thg 3.5 has "directory" diff viewer.
But we cannot see "All Files" diff in thg.
It is great that thg has "root" in diff.
![hgtk.png](https://bitbucket.org/repo/48R4X/images/1694643553-hgtk.png)
![thg.png](https://bitbucket.org/repo/48R4X/images/2267110296-thg.png)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4284File/History Annotate bug2020-06-21T10:55:54ZBitbucket ImporterFile/History Annotate bug*Created originally on Bitbucket by [ivklm](https://bitbucket.org/%7B88cf778b-91f7-432b-a844-fe1d5d38db10%7D/)*
Open file list
Select file with long history, click File/History Annotate in context menu
Get error immediately or while s...*Created originally on Bitbucket by [ivklm](https://bitbucket.org/%7B88cf778b-91f7-432b-a844-fe1d5d38db10%7D/)*
Open file list
Select file with long history, click File/History Annotate in context menu
Get error immediately or while scrolling history list
Get it in 3.3.3 and 3.5 version
#!python
** Mercurial version (3.5+5). TortoiseHg version (3.5)
** Command:
** CWD: D:\Documents and Settings\kolmakov-iv
** Encoding: cp1251
** Extensions loaded: strip, mq, rebase, children, churn, extdiff, hgk, keyword, convert, hgcr-gui-qt
** Python version: 2.7.9 (default, Dec 10 2014, 12:24:55) [MSC v.1500 32 bit (Intel)]
** Windows version: sys.getwindowsversion(major=5, minor=1, build=2600, platform=2, service_pack='Service Pack 3')
** Processor architecture: x86
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\fileview.pyo", line 1073, in _onAnnotateFinished
File "tortoisehg\hgqt\fileview.pyo", line 1079, in _updateView
File "tortoisehg\hgqt\fileview.pyo", line 1096, in _updaterevmargin
KeyError: 1112
*Attachments:* [bugreport.txt](/uploads/1bd5b5a16beb987d3bd3ed84d1f91237/bugreport.txt)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4279Shelve crash on renamed file2020-06-21T10:55:47ZBitbucket ImporterShelve crash on renamed file*Created originally on Bitbucket by [dddinu (Dinu M)](https://bitbucket.org/%7Bd12cb082-90c2-415b-9b02-7439214b0269%7D/)*
#!python
** Mercurial version (3.5). TortoiseHg version (3.5)
** Command:
** CWD: /root
...*Created originally on Bitbucket by [dddinu (Dinu M)](https://bitbucket.org/%7Bd12cb082-90c2-415b-9b02-7439214b0269%7D/)*
#!python
** Mercurial version (3.5). TortoiseHg version (3.5)
** Command:
** CWD: /root
** Encoding: UTF-8
** Extensions loaded: strip, mq, rebase, shelve, transplant
** Python version: 2.7.5 (default, Jun 17 2014, 18:11:42) [GCC 4.8.2 20140120 (Red Hat 4.8.2-16)]
** System: Linux dev7.local 3.10.0-229.4.2.el7.x86_64 #1 SMP Wed May 13 10:06:09 UTC 2015 x86_64
** Qt-4.8.5 PyQt-4.10.1 QScintilla-2.8
Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/tortoisehg/hgqt/shelve.py", line 220, in moveFileLeft
if chunks and self.browsea.mergeChunks(file, chunks):
File "/usr/lib/python2.7/site-packages/tortoisehg/hgqt/chunks.py", line 364, in mergeChunks
return self.runPatcher(fp, wfile, True)
File "/usr/lib/python2.7/site-packages/tortoisehg/hgqt/chunks.py", line 187, in runPatcher
eolmode=eolmode, similarity=0)
File "/usr/lib64/python2.7/site-packages/mercurial/patch.py", line 2042, in internalpatch
return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode)
File "/usr/lib64/python2.7/site-packages/mercurial/patch.py", line 2027, in patchbackend
eolmode=eolmode)
File "/usr/lib64/python2.7/site-packages/mercurial/patch.py", line 1878, in applydiff
prefix=prefix, eolmode=eolmode)
File "/usr/lib64/python2.7/site-packages/mercurial/patch.py", line 1924, in _applydiff
assert data is not None
AssertionError
Sequence of operations:
- create changeset involving one file being renamed
- shelve changeset
- switch to different branch
- unshelve changeset. Crashes when created the added (rename target) file.
There would have been no conflict if operation didn't crash.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4273Error opening shelve while another operation is running2020-06-21T10:55:42ZBitbucket ImporterError opening shelve while another operation is running*Created originally on Bitbucket by [DeeHants (Deanna Earley)](https://bitbucket.org/%7B72bdd83e-5cb2-4920-b99f-e9a99b688617%7D/)*
#!python
** Mercurial version (3.5+5). TortoiseHg version (3.5)
** Command:
** CWD: ...*Created originally on Bitbucket by [DeeHants (Deanna Earley)](https://bitbucket.org/%7B72bdd83e-5cb2-4920-b99f-e9a99b688617%7D/)*
#!python
** Mercurial version (3.5+5). TortoiseHg version (3.5)
** Command:
** CWD: C:\Program Files\TortoiseHg
** Encoding: cp1252
** Extensions loaded: onsub, convert, record, strip, mq, rebase, transplant, hgk, shelve, histedit, hggit, largefiles
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\chunks.pyo", line 147, in timerEvent
AttributeError: 'ChunksWidget' object has no attribute 'ctx'
Traceback (most recent call last):
File "tortoisehg\hgqt\chunks.pyo", line 147, in timerEvent
AttributeError: 'ChunksWidget' object has no attribute 'ctx'
I received this error when trying to open the shelve immediately after unapplying a number of patches.
The shelve window never appeared, and it keeps reoccurring on the timer.
Trying to select items in the changeset list didn't help.
Trying it a more times produces this error (but with different files):
#!python
** Mercurial version (3.5+5). TortoiseHg version (3.5)
** Command:
** CWD: C:\Program Files\TortoiseHg
** Encoding: cp1252
** Extensions loaded: onsub, convert, record, strip, mq, rebase, transplant, hgk, shelve, histedit, hggit, largefiles
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\manifestmodel.pyo", line 353, in fetchMore
File "tortoisehg\hgqt\manifestmodel.pyo", line 406, in _populateNodes
File "tortoisehg\hgqt\manifestmodel.pyo", line 585, in _populaterepo
File "mercurial\localrepo.pyo", line 64, in wrapper
File "hgext\largefiles\reposetup.pyo", line 145, in status
File "mercurial\localrepo.pyo", line 1696, in status
File "mercurial\context.pyo", line 324, in status
File "mercurial\context.pyo", line 1592, in _buildstatus
File "mercurial\context.pyo", line 1565, in _dirstatestatus
File "mercurial\context.pyo", line 1509, in _checklookup
File "mercurial\context.pyo", line 755, in cmp
File "mercurial\context.pyo", line 1067, in size
File "mercurial\util.pyo", line 531, in __get__
File "mercurial\context.pyo", line 658, in _filerev
File "mercurial\util.pyo", line 531, in __get__
File "mercurial\context.pyo", line 652, in _filenode
File "mercurial\revlog.pyo", line 916, in lookup
LookupError: data/UncoupledDecoder.h.i@23a950a08770: no match found