thg issueshttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues2020-06-21T11:20:13Zhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5451Alt+Number shortcuts in the View-menu break Windows Alt-Code character input ...2020-06-21T11:20:13ZBitbucket ImporterAlt+Number shortcuts in the View-menu break Windows Alt-Code character input method*Created originally on Bitbucket by Anonymous*
TortioseHg uses the keyboard shortcuts Alt+0 for Show Task Tab and Alt+1 … Alt+4 to select the contents of the Task Tab (Revision Details, Commit, Search, or Synchronise)
Windows uses ‘A...*Created originally on Bitbucket by Anonymous*
TortioseHg uses the keyboard shortcuts Alt+0 for Show Task Tab and Alt+1 … Alt+4 to select the contents of the Task Tab (Revision Details, Commit, Search, or Synchronise)
Windows uses ‘Alt-Codes’ for input of off-keyboard characters, e.g. Alt+0176 for the degree sign °.
As Windows Alt-Codes require num-pad numbers: is it maybe possible to restrict the thg shortcuts to ‘normal’ numbers?
How to reproduce:
Open a repository in THG, open the Commit tab, place the cursor in the commit message. Press and hold the Alt key, then type on the num-pad: 0 1 7 6, then release Alt.
Expected outcome: the character ° is inserted into the commit message before the cursor
Actual outcome: the task tab is closed (Alt+0) , then opened again showing Revision Details (Alt+1). (Alt+7 and Alt+6 are then ignored)
thg 5.0.2https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2248Alt-Tab icon different from application icon2020-06-21T10:24:51ZBitbucket ImporterAlt-Tab icon different from application icon*Created originally on Bitbucket by [vermiceli (Michael Miceli)](https://bitbucket.org/%7Bffaf1629-d79a-455a-ba13-b06e4e16b621%7D/)*
If you press alt tab the icon on the bottom right of the alt-tab image is different from the applicatio...*Created originally on Bitbucket by [vermiceli (Michael Miceli)](https://bitbucket.org/%7Bffaf1629-d79a-455a-ba13-b06e4e16b621%7D/)*
If you press alt tab the icon on the bottom right of the alt-tab image is different from the application icon on the taskbar/startmenu.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/331Always asks rebase after pull2020-06-21T09:45:39ZBitbucket ImporterAlways asks rebase after pull*Created originally on Bitbucket by Anonymous*
Can't tell why / how, but tortoisehg 2.0.0 keeps argueing i should do a rebase after a pull but I really don't want to, but rather want to merge the heads as that is the "true" history how ...*Created originally on Bitbucket by Anonymous*
Can't tell why / how, but tortoisehg 2.0.0 keeps argueing i should do a rebase after a pull but I really don't want to, but rather want to merge the heads as that is the "true" history how the project evolved.
*Attachments:* [rebasestate](/uploads/7eaf5461d55ee22ee41ccfedcec631b1/rebasestate)[screen-331](/uploads/c747710e46959d7657759448f35ccb38/screen-331.png)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2492Always asks username and password on subrepositories.2020-06-21T10:30:01ZBitbucket ImporterAlways asks username and password on subrepositories.*Created originally on Bitbucket by [jesusvpct (Jesús Vidal Panalés)](https://bitbucket.org/%7B09b4fc8d-9313-400b-ac4f-df2627a91ad9%7D/)*
I have a repository hosted on a server, and i have a subrepository cloned from external external r...*Created originally on Bitbucket by [jesusvpct (Jesús Vidal Panalés)](https://bitbucket.org/%7B09b4fc8d-9313-400b-ac4f-df2627a91ad9%7D/)*
I have a repository hosted on a server, and i have a subrepository cloned from external external repository hosted on another server. When checking/pull/push it's always asking me for a username and password for that subrepository. I have configured it on tortoise but it's ignoring it.
I've made a test, to see what happen if there is a repository on a server, and the subrepos are in the same server, and this works fine, so i think that the problem only happens when using two differents servers (differents urls) on repository and subrepository.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2033Always push to default (or ability to make targets read-only)2020-06-21T10:20:25ZBitbucket ImporterAlways push to default (or ability to make targets read-only)*Created originally on Bitbucket by [skrysmanski (Sebastian Krysmanski)](https://bitbucket.org/%7B7a215f8e-98e6-4b67-9fa8-d0e525b9117f%7D/)*
Please make the "Push" (and "Pull", "Outgoing", "Incoming") buttons in the THG Workbench toolba...*Created originally on Bitbucket by [skrysmanski (Sebastian Krysmanski)](https://bitbucket.org/%7B7a215f8e-98e6-4b67-9fa8-d0e525b9117f%7D/)*
Please make the "Push" (and "Pull", "Outgoing", "Incoming") buttons in the THG Workbench toolbar use the "default" repository, and **not** the one selected in the "Synchronize" view.
I have a lot repositories that pull (and only pull) from other repositories (beside the "default" repository). Now, when my last operation was to pull from such a non-default repository, and I forget to change the selection back to the default repository in the "Synchronize" view, the next time I hit the "Push" button (usually from the "Commit" view) I push accidentally to the non-default repository instead of the default one.
Alternative ideas:
* Add the ability to mark certain repositories (in the "Synchronize" view) "read-only" to avoid accidental pushes to them.
* Give the user a dialog before pushing where he/she can select the repository (URL) to be used.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2113Always show activity bar at the bottom2020-06-21T10:22:08ZBitbucket ImporterAlways show activity bar at the bottom*Created originally on Bitbucket by [xrstf (Christoph)](https://bitbucket.org/%7Bea9a2c65-d5f3-47d4-b520-11ec36f1a742%7D/)*
Currently, when doing a pull or push, TortoiseHg shows a green "activity bar" at the top of the UI, right below ...*Created originally on Bitbucket by [xrstf (Christoph)](https://bitbucket.org/%7Bea9a2c65-d5f3-47d4-b520-11ec36f1a742%7D/)*
Currently, when doing a pull or push, TortoiseHg shows a green "activity bar" at the top of the UI, right below the toolbar. When the operation is completed, the bar disappears after the first click.
I have configured TortoiseHg to **not** do an update after pulling. Instead, I want to select the revision from hand and update manually. Unfortunately, when the pull is done and I want to click on the revision to update, the "activity bar" disappears and the revision graph shifts a bit. So I have to click again to select the desired revision.
It seems like it's generally a good idea to not move the UI elements in those cases (I haven't done any research, it just seems like common sense). If one would put the bar at the bottom, the UI would remain "stable" and the user wouldn't be disrupted and loses focus.
It's just a minor inconvenience, but would still be a nice-to-have and easy-to-implement. :-)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/3599Amend button does not return the widget to commit state2023-09-20T03:54:28ZBitbucket ImporterAmend button does not return the widget to commit state*Created originally on Bitbucket by [yruslan (Ruslan Yushchenko)](https://bitbucket.org/%7Bb452f22d-f78d-4944-9e5f-e2d27ea3b8b4%7D/)*
In 2.11 clicking on Amend button does not return to Commit mode as in 2.10.2 and below, although amend...*Created originally on Bitbucket by [yruslan (Ruslan Yushchenko)](https://bitbucket.org/%7Bb452f22d-f78d-4944-9e5f-e2d27ea3b8b4%7D/)*
In 2.11 clicking on Amend button does not return to Commit mode as in 2.10.2 and below, although amendment does happen. Clicking Amend button one more time produces an error message with text "[Code: 1]".
Note. Behavior looks similar as in [2406](https://bitbucket.org/tortoisehg/thg/issue/2406/amend-does-not-automatically-refresh) https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4384Amend can not forget files2020-06-21T10:57:58ZBitbucket ImporterAmend can not forget files*Created originally on Bitbucket by [psuter (Peter Suter)](https://bitbucket.org/%7B48b289e8-68dd-4aa4-8d3a-6458c5363d69%7D/)*
Steps to reproduce:
```
hg init
echo foo > foo.txt
echo bar > bar.txt
hg add foo.txt
hg add bar.txt
hg...*Created originally on Bitbucket by [psuter (Peter Suter)](https://bitbucket.org/%7B48b289e8-68dd-4aa4-8d3a-6458c5363d69%7D/)*
Steps to reproduce:
```
hg init
echo foo > foo.txt
echo bar > bar.txt
hg add foo.txt
hg add bar.txt
hg commit -m "Added foo and bar"
hg rm bar.txt
echo (but not bar) >> foo.txt
thg
```
Now in TortoiseHG switch to "Amend" mode, modify the commit message and click the Amend button.
Expected behavior: The changeset should not contain `bar.txt` anymore.
Actual (wrong?) behavior: The changeset still contains `bar.txt`.
----
A similar problem is adding a file, commit, renaming it, amend. It does not seem possible to amend the changeset in such a way that only the renamed file is added.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4140Amend claims "nothing changed"; command line works2020-06-21T10:52:43ZBitbucket ImporterAmend claims "nothing changed"; command line works*Created originally on Bitbucket by Anonymous*
When the working directory contains removed or renamed files (with "!" or "R"), amending these into the tip revision is not possible.
When In the Commit panel, with the button on Commit ...*Created originally on Bitbucket by Anonymous*
When the working directory contains removed or renamed files (with "!" or "R"), amending these into the tip revision is not possible.
When In the Commit panel, with the button on Commit mode, the changes are shown. When I change the button to Amend mode, these files are gone but others changes are still normally visible among the files already in the revision). Trying to execure the amend gives the error "Nothing changed".
**Workaround:**
Executing "hg commit --amend" from the log window works as expected and now the working directory shows no changes. The removed/renamed files are properly registered in the tip revision as expected.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2406Amend does not automatically refresh working directory2020-06-21T10:28:04ZBitbucket ImporterAmend does not automatically refresh working directory*Created originally on Bitbucket by [yruslan (Ruslan Yushchenko)](https://bitbucket.org/%7Bb452f22d-f78d-4944-9e5f-e2d27ea3b8b4%7D/)*
To reproduce the behavior:
1. In TortoiseHG Workbench select a repository and click on Working Dir...*Created originally on Bitbucket by [yruslan (Ruslan Yushchenko)](https://bitbucket.org/%7Bb452f22d-f78d-4944-9e5f-e2d27ea3b8b4%7D/)*
To reproduce the behavior:
1. In TortoiseHG Workbench select a repository and click on Working Directory. Make change to arbitrary file.
2. Select "Amend" instead of "Commit". In status window changed files will be shown.
3. Amend the changes.
4. Status window still shows that files are changed (need to manually click "Refresh file list" button).
The behavior have been introduced in 2.7https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/3868Amend doesn't refresh DAG tree2020-06-21T10:46:58ZBitbucket ImporterAmend doesn't refresh DAG tree*Created originally on Bitbucket by [Roger Kratz](https://bitbucket.org/%7Bd89f41f0-77b6-45c5-ab74-ecc92834f85a%7D/)*
Hi
Sometimes (not really sure _when_), the DAG tree isn't refreshed when I'm amending. Also thg still thinks the fi...*Created originally on Bitbucket by [Roger Kratz](https://bitbucket.org/%7Bd89f41f0-77b6-45c5-ab74-ecc92834f85a%7D/)*
Hi
Sometimes (not really sure _when_), the DAG tree isn't refreshed when I'm amending. Also thg still thinks the files are modified in my working directory.
When this happens I need to restart thg.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/3276Amend doesn't work when files were removed2020-06-21T10:34:30ZBitbucket ImporterAmend doesn't work when files were removed*Created originally on Bitbucket by Anonymous*
Steps to reproduce:
```
hg init
echo foo > foo.txt
echo bar > bar.txt
hg add foo.txt
hg add bar.txt
hg commit -m "Added foo and bar"
hg rm bar.txt
echo (but not bar) >> foo.txt
...*Created originally on Bitbucket by Anonymous*
Steps to reproduce:
```
hg init
echo foo > foo.txt
echo bar > bar.txt
hg add foo.txt
hg add bar.txt
hg commit -m "Added foo and bar"
hg rm bar.txt
echo (but not bar) >> foo.txt
hg commit -m "Remove bar"
thg
```
Now in TortoiseHG switch to "Amend" mode, modify the commit message and click the Amend button. Error:
```
abort: bar.txt: The system cannot find the file specified
```https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2343Amend fails if the current changeset contains deletes (removed files)2020-06-21T10:26:47ZBitbucket ImporterAmend fails if the current changeset contains deletes (removed files)*Created originally on Bitbucket by Anonymous*
To reproduce: create clean temp repo, in my example "t".
Add 3 files "a", "b", "c".
Commit. Revision "0" is created.
Delete "a" and "b", commit, revision "1" is created. This revision ...*Created originally on Bitbucket by Anonymous*
To reproduce: create clean temp repo, in my example "t".
Add 3 files "a", "b", "c".
Commit. Revision "0" is created.
Delete "a" and "b", commit, revision "1" is created. This revision removes 2 files.
~~~~
% hg commit --repository D:\t --verbose --user Valters Vingolds <valters.vingolds@exigenservices.com> --message=delete a b -- D:\t\a D:\t\b
committed changeset 1:cc0f14d784c1
[command completed successfully Tue Jan 08 11:43:30 2013]
~~~~
Modify "c". Try to "Amend" the current revision, by adding the changes in "c".
Following output is produced by TortoiseHg:
~~~~
% hg commit --repository D:\t --verbose --user Valters Vingolds <valters.vingolds@exigenservices.com> --message=delete a b --amend -- D:\t\c D:\t\a D:\t\b
amending changeset cc0f14d784c1
abort: a: Das System kann die angegebene Datei nicht finden
[command returned code 255 Tue Jan 08 11:44:06 2013]
~~~~
Maybe this is not TortoiseHg fault, maybe "--amend" is somehow broken by hg. Or maybe TortoiseHg is not passing the correct command line to hg? In any case, "Amend" functionality in TortoiseHg is broken if the changeset contains deleted files. Please also see attached screenshot.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2235Amend fails on a commit with rename (or delete)2020-06-21T10:24:38ZBitbucket ImporterAmend fails on a commit with rename (or delete)*Created originally on Bitbucket by [kankri](https://bitbucket.org/%7Ba2525b4b-5b7a-4de8-85f1-628fd4b19449%7D/)*
Input
1. hg init
1. echo a > a
1. hg commit -A -m "a"
1. hg mv a b
1. hg commit -m "a -> b"
1. echo c > c
1. hg ad...*Created originally on Bitbucket by [kankri](https://bitbucket.org/%7Ba2525b4b-5b7a-4de8-85f1-628fd4b19449%7D/)*
Input
1. hg init
1. echo a > a
1. hg commit -A -m "a"
1. hg mv a b
1. hg commit -m "a -> b"
1. echo c > c
1. hg add c
1. thg commit
1. Change ```Commit``` button to ```Amend```
1. Select file ```c``` (in addition to preselected ```a``` and ```b```)
1. Press ```Amend```
Result
```
% hg commit --repository C:\Users\kankri\wrk\hg_amend_test --verbose --user someone@example.com --message=a -> b --amend -- b c a
amending changeset e0191deaba30
abort: a: The system cannot find the file specified
```
If ```a``` is manually deselected, amend succeeds, but this feels counter-intuitive.
The GUI could show an unselectable check mark for the committed removal of ```a``` and filter out any non-changed files in the actual ```hg commit --amend``` command.
But I'm thinking that maybe it's the wrong approach to try to show what the commit _will contain_ after amending instead of showing what is being amended. That is, show the same information for ```Amend``` as what is shown for ```Commit```.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5954Amend fails with "Nothing changed" when trying to cancel change2023-11-03T21:57:09ZPhilippe CloutierAmend fails with "Nothing changed" when trying to cancel changeUsing TortoiseHg 6.5.1, if one accidentally includes changes to file _x_ in a commit and tries using _Amend_ to cancel changes to _x_, the commit keeps the unwanted changes. If the amendment only consists of such cancellations, the amend...Using TortoiseHg 6.5.1, if one accidentally includes changes to file _x_ in a commit and tries using _Amend_ to cancel changes to _x_, the commit keeps the unwanted changes. If the amendment only consists of such cancellations, the amendment attempt fails with a dialog titled "Nothing Committed" which contains:
> Nothing changed.
To **workaround**, one can strip the incorrect commit using Strip's `--keep` option and perform a new commit to replace it.
This is related to ticket #3251 .https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5956Amend may fail with "Nothing changed" when trying to cancel change2023-11-21T14:13:52ZPhilippe CloutierAmend may fail with "Nothing changed" when trying to cancel changeUsing TortoiseHg 6.5.1, if one accidentally includes changes to file _x_ in a commit and tries using _Amend_ to cancel changes to _x_, the commit can keep the unwanted changes. If the amendment only consists of such cancellations, the am...Using TortoiseHg 6.5.1, if one accidentally includes changes to file _x_ in a commit and tries using _Amend_ to cancel changes to _x_, the commit can keep the unwanted changes. If the amendment only consists of such cancellations, the amendment attempt can fail with a dialog titled "Nothing Committed" which contains:
> Nothing changed.
This is because the way to cancel a change is unintuitive/inefficient/confusing. The user will most likely try something like the following:
0. Create a commit with (for example) modifications to 2 files
1. Select the _* Working Directory *_ line (top)
1. Click on the arrow to the right of _Commit_
1. Select _Amend current revision_
1. Uncheck a file (left)
1. Activate the _Amend_ button (right)
To properly cancel a change to a file, one can either:
* Instead of step #4, modify the mistakenly changed file to bring its contents back to its earlier state. This could for example be done with a text editor.
* or strip the incorrect commit using Strip's `--keep` option and perform a new commit to replace it.
This is related to ticket #3251 .https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4982Ammending commit doesn't want to remove (parts of) files2020-06-21T11:10:29ZBitbucket ImporterAmmending commit doesn't want to remove (parts of) files*Created originally on Bitbucket by [Mojca Miklavec](https://bitbucket.org/%7Bcb53c37c-cf82-4243-83ba-46956c63ca0a%7D/)*
I often make the mistake of forgetting to uncheck some files before commiting. I realize this after clicking the "c...*Created originally on Bitbucket by [Mojca Miklavec](https://bitbucket.org/%7Bcb53c37c-cf82-4243-83ba-46956c63ca0a%7D/)*
I often make the mistake of forgetting to uncheck some files before commiting. I realize this after clicking the "commit" button, but before pushing to a public repository and I would like to remove a couple of files from that commit before making the commit public.
The "Ammend" functionality works perfectly when I **forget** to add some files. I can then just add the missing bits and pieces and click Ammend. But the same doesn't work when I try to remove files. Tortoise just tells me that there's nothing to commit.
I then spent quite some time trying to figure out how to properly do this from the command-line. I didn't find a straightforward way yet. A lazy-man approach for me in git would usually be "git reset HEAD~1" which would undo the last commit without modify the files and then repeat the commit steps themselves again (I would need to retype the). After a lot of searching I figured out the mercurial equivalent being "hg strip --keep ." I also spent quite some time time trying to figure out how to do that in TortoiseHG, but without any success yet. That's a different issue or perhaps a feature request in case it's not yet implemented.
But being able to remove files from the last commit would be super super useful.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2548An error2020-06-21T10:31:11ZBitbucket ImporterAn error*Created originally on Bitbucket by [Igor Timoshenkov (Игорь Тимошенков)](https://bitbucket.org/%7Ba2e3fa78-ebe7-422d-9b7c-7bbd75ad9157%7D/)*
```
#!python
#!python
** Mercurial version (2.5.4). TortoiseHg version (2.7.1)...*Created originally on Bitbucket by [Igor Timoshenkov (Игорь Тимошенков)](https://bitbucket.org/%7Ba2e3fa78-ebe7-422d-9b7c-7bbd75ad9157%7D/)*
```
#!python
#!python
** Mercurial version (2.5.4). TortoiseHg version (2.7.1)
** Command: log
** CWD: /home/t1gor
** Encoding: UTF-8
** Extensions loaded:
** Python version: 2.7.3 (default, Aug 1 2012, 05:16:07) [GCC 4.6.3]
** System: Linux ubuntu 3.5.0-27-generic #46~precise1-Ubuntu SMP Tue Mar 26 19:33:56 UTC 2013 i686
** Qt-4.8.1 PyQt-4.9.1 QScintilla-2.6.1
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/tortoisehg/hgqt/fileview.py", line 466, in displayFile
fd = filedata.FileData(self._ctx, ctx2, filename, status, self.changeselection, force=force)
File "/usr/lib/python2.7/dist-packages/tortoisehg/hgqt/filedata.py", line 39, in __init__
self.readStatus(ctx, ctx2, wfile, status, changeselect, force)
File "/usr/lib/python2.7/dist-packages/tortoisehg/hgqt/filedata.py", line 398, in readStatus
elif 'x' not in fctx.flags() and 'x' in pctx.flags(wfile):
File "/usr/lib/python2.7/dist-packages/mercurial/context.py", line 312, in flags
return self._fileinfo(path)[1]
File "/usr/lib/python2.7/dist-packages/mercurial/context.py", line 300, in _fileinfo
node, flag = self._repo.manifest.find(self._changeset[0], path)
File "/usr/lib/python2.7/dist-packages/mercurial/localrepo.py", line 27, in __get__
return super(repofilecache, self).__get__(repo.unfiltered(), type)
File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 971, in __get__
entry.obj = self.func(obj)
File "/usr/lib/python2.7/dist-packages/mercurial/localrepo.py", line 364, in manifest
return manifest.manifest(self.sopener)
File "/usr/lib/python2.7/dist-packages/mercurial/manifest.py", line 32, in __init__
revlog.revlog.__init__(self, opener, "00manifest.i")
File "/usr/lib/python2.7/dist-packages/mercurial/revlog.py", line 245, in __init__
raise RevlogError(_("index %s is corrupted") % (self.indexfile))
RevlogError: index 00manifest.i is corrupted
```
*Attachments:* [thg_error](/uploads/35c523d2ff456353a57f84e5fbf60100/thg_error.png)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5277An error meessage when I am trying to open workbench2020-06-21T11:16:51ZBitbucket ImporterAn error meessage when I am trying to open workbench*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (4.7.1). TortoiseHg version (4.7.1)
** Command: --nofork workbench
** CWD: F:\Projects\noraxon.mr3\src
** Encoding: cp1251
** Extensi...*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (4.7.1). TortoiseHg version (4.7.1)
** Command: --nofork workbench
** CWD: F:\Projects\noraxon.mr3\src
** Encoding: cp1251
** Extensions loaded: strip, mq, tortoisehg.util.configitems
** Python version: 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-5.9.2 PyQt-5.9.1 QScintilla-2.10.2.dev1711012104
Traceback (most recent call last):
File "tortoisehg\hgqt\repowidget.pyo", line 267, in _initView
File "tortoisehg\hgqt\repowidget.pyo", line 863, in _updateRepoViewForModel
File "tortoisehg\hgqt\repomodel.pyo", line 673, in defaultIndex
File "tortoisehg\hgqt\repomodel.pyo", line 690, in indexFromRev
File "tortoisehg\hgqt\repomodel.pyo", line 414, in _ensureBuilt
File "tortoisehg\hgqt\graph.pyo", line 955, in build_nodes
File "tortoisehg\hgqt\graph.pyo", line 632, in _iter_graphnodes
File "tortoisehg\hgqt\graph.pyo", line 820, in fromchangectx
File "tortoisehg\hgqt\thgrepo.pyo", line 1015, in thgmqappliedpatch
File "tortoisehg\hgqt\thgrepo.pyo", line 1007, in _thgmqpatchtags
File "mercurial\context.pyo", line 517, in tags
File "mercurial\localrepo.pyo", line 1038, in nodetags
File "mercurial\util.pyo", line 1412, in __get__
File "mercurial\localrepo.pyo", line 960, in _tagscache
File "hgext\mq.pyo", line 3527, in _findtags
File "mercurial\localrepo.pyo", line 996, in _findtags
File "mercurial\tags.pyo", line 180, in findglobaltags
File "mercurial\tags.pyo", line 460, in _readtagcache
File "mercurial\tags.pyo", line 476, in _getfnodes
File "mercurial\tags.pyo", line 721, in getfnode
File "mercurial\context.pyo", line 268, in filenode
File "mercurial\context.pyo", line 254, in _fileinfo
File "mercurial\context.pyo", line 505, in files
File "mercurial\util.pyo", line 1412, in __get__
File "mercurial\context.pyo", line 465, in _changeset
File "mercurial\changelog.pyo", line 498, in changelogrevision
File "mercurial\revlog.pyo", line 2146, in revision
mpatchError: patch cannot be decodedhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/3428An error occurred when trying to merge2020-06-21T10:37:42ZBitbucket ImporterAn error occurred when trying to merge*Created originally on Bitbucket by Anonymous*
The following error occurred immediately after I selected merge. Before merging I had committed my changes, tried to push (forgot to pull first, so got a warning dialog about that), then pu...*Created originally on Bitbucket by Anonymous*
The following error occurred immediately after I selected merge. Before merging I had committed my changes, tried to push (forgot to pull first, so got a warning dialog about that), then pulled last changes and right clicked the tip and selected merge.
So far it seems I can just close this error dialog window and continue as if nothing happened. The merge was committed in the next step of the dialog. I then pushed and it was successful.
~~~~
#!python
** Mercurial version (2.0.2). TortoiseHg version (2.2.2)
** Command:
** CWD: C:\Windows\system32
** Encoding: cp1252
** Extensions loaded:
** 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.4 PyQt-4.8.6
Traceback (most recent call last):
File "tortoisehg\hgqt\status.pyo", line 468, in run
File "mercurial\context.pyo", line 738, in status
File "mercurial\localrepo.pyo", line 1365, in status
File "mercurial\context.pyo", line 805, in flags
File "mercurial\util.pyo", line 239, in __get__
File "mercurial\context.pyo", line 669, in _flagfunc
File "mercurial\dirstate.pyo", line 150, in flagfunc
File "mercurial\context.pyo", line 652, in _buildflagfunc
File "mercurial\context.pyo", line 94, in manifest
File "mercurial\util.pyo", line 239, in __get__
File "mercurial\context.pyo", line 64, in _manifest
File "mercurial\util.pyo", line 239, in __get__
File "mercurial\context.pyo", line 60, in _changeset
File "mercurial\changelog.pyo", line 192, in read
File "mercurial\revlog.pyo", line 865, in revision
TypeError: 'NoneType' object is unsubscriptable
~~~~