thg issueshttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues2020-06-21T10:53:25Zhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4169"Detect renames" does not work in the same way as "hg addremove"2020-06-21T10:53:25ZBitbucket Importer"Detect renames" does not work in the same way as "hg addremove"*Created originally on Bitbucket by [mskr](https://bitbucket.org/%7Be8dcd926-70ae-4378-8e0d-fb526ec8a92b%7D/)*
As a user, I would like the "detect renames" button to detect renames and to behave similarly to "hg addremove"
To setup:
...*Created originally on Bitbucket by [mskr](https://bitbucket.org/%7Be8dcd926-70ae-4378-8e0d-fb526ec8a92b%7D/)*
As a user, I would like the "detect renames" button to detect renames and to behave similarly to "hg addremove"
To setup:
~~~~
hg init .
echo aaa > file.txt
hg commit -m "adding file"
mv file.txt renamed.txt
~~~~
Actual behavior:
If I try to "detect renames", the behavior is different depending on the state of the files:
If renamed.txt is unversioned and file.txt is missing:
"detect renames" work as expected and detects the rename.
If renamed.txt is added, file.txt is removed
OR renamed.txt is added, file.txt is missing
OR renamed.txt is unversioned, file.txt is removed
"detect renames" does not detect the rename.
Expected behavior
is for "detect renames" to work the same as "hg addremove", which detects the rename in all of the different cases.
Affected versions: 3.3.3 - 3.4.+7https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4168Add clean button for commit filter text2020-06-21T10:53:24ZBitbucket ImporterAdd clean button for commit filter text*Created originally on Bitbucket by [Alexei Artemiev (Алексей Артемьев)](https://bitbucket.org/%7B97c08b11-934e-45f7-9736-55614bc28604%7D/)*
Please add a button to clean all text in commit filter.*Created originally on Bitbucket by [Alexei Artemiev (Алексей Артемьев)](https://bitbucket.org/%7B97c08b11-934e-45f7-9736-55614bc28604%7D/)*
Please add a button to clean all text in commit filter.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4167Add revset queries to the file log viewer2020-06-21T10:53:23ZBitbucket ImporterAdd revset queries to the file log viewer*Created originally on Bitbucket by [xavierzwirtz](https://bitbucket.org/%7Baf1dff85-70ee-4869-87ae-b51bfa86675f%7D/)*
Would be handy to be able to use rev set queries in the file log. Would make tracking down particular changes a lot e...*Created originally on Bitbucket by [xavierzwirtz](https://bitbucket.org/%7Baf1dff85-70ee-4869-87ae-b51bfa86675f%7D/)*
Would be handy to be able to use rev set queries in the file log. Would make tracking down particular changes a lot easier.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4139Crash when stripping last changeset of branch included in filter2020-06-21T10:52:42ZBitbucket ImporterCrash when stripping last changeset of branch included in filter*Created originally on Bitbucket by [clechasseur (Charles Lechasseur)](https://bitbucket.org/%7B8ff244c4-6ce8-4653-a60f-cabea84e464e%7D/)*
Steps to reproduce:
- In TortoiseHg Workbench, select File -> New Repository. Create empty rep...*Created originally on Bitbucket by [clechasseur (Charles Lechasseur)](https://bitbucket.org/%7B8ff244c4-6ce8-4653-a60f-cabea84e464e%7D/)*
Steps to reproduce:
- In TortoiseHg Workbench, select File -> New Repository. Create empty repo anywhere (I unchecked "Add special files")
- Run the following commands in the Console:
hg branch base
hg commit -m base
hg branch foo
hg commit -m foo
- Open the Filter toolbar and enter the following filter:
branch(base) or branch(foo)
- Right-click on the last changeset and select Modify History -> Strip. Confirm by pressing the Strip button. (Also works by executing "hg strip tip" in Console)
BAM. Bug report is attached below. Pressing OK simply shows the bug report again until you choose Quit.
This doesn't happen if the branch that goes away is not int he filter. For example, crash won't happen if filter is
branch(base) or tip
#!python
** Mercurial version (3.3.3). TortoiseHg version (3.3.3)
** Command: --nofork workbench
** CWD: C:\Users\clechasseur\Desktop
** Encoding: cp1252
** Extensions loaded: acl, churn, eol, relink, mercurial_keyring, checkfiles, extdiff, children, fetch, strip, mq, onsub, purge, rebase, share, transplant, convert
** 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\repomodel.pyo", line 316, in _onQueryFinished
File "tortoisehg\hgqt\repomodel.pyo", line 261, in _rebuildGraph
File "tortoisehg\hgqt\repomodel.pyo", line 373, in _ensureBuilt
File "tortoisehg\hgqt\graph.pyo", line 874, in build_nodes
File "tortoisehg\hgqt\graph.pyo", line 612, in _iter_graphnodes
File "tortoisehg\hgqt\graph.pyo", line 764, in fromchangectx
File "mercurial\context.pyo", line 524, in phase
File "mercurial\phases.pyo", line 216, in phase
IndexError: list index out of range
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 467, in data
File "tortoisehg\hgqt\graph.pyo", line 839, in __getitem__
IndexError: list index out of range
...
Traceback (most recent call last):
File "tortoisehg\hgqt\repomodel.pyo", line 467, in data
File "tortoisehg\hgqt\graph.pyo", line 839, in __getitem__
IndexError: list index out of rangehttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4138Allow renaming of shelves2020-06-21T10:52:41ZBitbucket ImporterAllow renaming of shelves*Created originally on Bitbucket by [rpastric](https://bitbucket.org/%7B3349ae1d-bbc8-45b4-8b76-2d11a88b286e%7D/)*
It would be nice to be able to edit the name of a shelf so that I can put a little bit more information into it later on....*Created originally on Bitbucket by [rpastric](https://bitbucket.org/%7B3349ae1d-bbc8-45b4-8b76-2d11a88b286e%7D/)*
It would be nice to be able to edit the name of a shelf so that I can put a little bit more information into it later on.
I can do this by manually going to the .hg\shelves folder and renaming it there but that is a bit annoying.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4130Add an ability to perform both a rebase --svn AND THEN an IMMEDIATE update op...2020-06-21T10:52:30ZBitbucket ImporterAdd an ability to perform both a rebase --svn AND THEN an IMMEDIATE update operation, after pull*Created originally on Bitbucket by [TimVargo (Tim Vargo)](https://bitbucket.org/%7B81d9241c-24c6-4c41-938a-d3d10a3dd4c5%7D/)*
I propose adding a new mode for postpull: "rebase--svn-then-update". This would be useful only to users of t...*Created originally on Bitbucket by [TimVargo (Tim Vargo)](https://bitbucket.org/%7B81d9241c-24c6-4c41-938a-d3d10a3dd4c5%7D/)*
I propose adding a new mode for postpull: "rebase--svn-then-update". This would be useful only to users of the hgsubversion extension, or any other extension that attempts to bridge Mercurial to an SVN repo.
I have several times now corrupted my local hgsubversion repo, because I failed to follow the proper workflow; but currently the Thg options do not allow me to automate that proper workflow. There is already a postpull mode of "rebase --svn" which helps tremendously, but this alone stops just short of what is truly needed. Users of the hgsubversion extension should always follow every *pull* operation (which always creates a new branch) with a *rebase --svn* operation to 'pseudo-merge' this new branch back with the head, and maintain a linear history. While the *rebase --svn* operation accomplishes this part very well, the very next thing that is then required is to perform an *update* operation. Failure to do so before making any modification to a versioned file will create a series of problems, starting with an inability to *update* if there are uncommited modifications (that you don't wish to discard). To make matters even worse, a very misleading tip will steer the unsuspecting user towards performing an Hg *merge* operation, which is THE LAST THING THAT SHOULD BE DONE, because this will lead to a corruption of the hgsubversion local repo!
If a new mode for postpull existed which allowed users to automate a "rebase--svn-then-update", said hgsubversion users could avoid a lot of frustration and potential repo corruption. This new mode could provide a lot of relief from the following (but not exhaustive) series of error messages:
-- "not a head revision"
-- "can't find svn parent of a merge revision"
-- "cannot backout a merge changeset"
-- "Outgoing changesets parent is not at subversion HEAD" (once you see this, your local hgsubversion repo is corrupt, and fixing it is very painful)
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4127Sort by Name mixes folders and files2020-06-21T10:52:27ZBitbucket ImporterSort by Name mixes folders and files*Created originally on Bitbucket by [teo8976 (Teo Tei)](https://bitbucket.org/%7B4d381d15-4c61-4a29-9de3-d1b5a89dbb2a%7D/)*
Steps to reproduce:
- right-click on a folder containing both repositories and subfolders on the left panel
...*Created originally on Bitbucket by [teo8976 (Teo Tei)](https://bitbucket.org/%7B4d381d15-4c61-4a29-9de3-d1b5a89dbb2a%7D/)*
Steps to reproduce:
- right-click on a folder containing both repositories and subfolders on the left panel
- select "sort by name"
Expected:
It should sort first all subfolders in alphabetical order, and then all repositories in alphabetical order
Observed:
it mixes both, so you get a list with repositories interleaved with subfolders.
If you think that some people may actually prefer this way of sorting (I seem to remember that Mac OS's Finder does the same by default, which is insane but some may be used to it), then both options may be provided. https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4124Add keyboard support to Shelve window2020-06-21T10:52:24ZBitbucket ImporterAdd keyboard support to Shelve window*Created originally on Bitbucket by Anonymous*
Shelve window is very useful. Because of poor project organization I'm working on I have to use it very often (shelving configuration files basically). However it is impossible to perform a...*Created originally on Bitbucket by Anonymous*
Shelve window is very useful. Because of poor project organization I'm working on I have to use it very often (shelving configuration files basically). However it is impossible to perform any action using keyboard. It would be nice if basic actions (move all left/right, clear, close) could be performed using keyboard onlyhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4119Unknown parent crash during checking incoming changes2020-06-21T10:52:17ZBitbucket ImporterUnknown parent crash during checking incoming changes*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (3.3.2). TortoiseHg version (3.3.2)
** Command:
** CWD: C:\ProgramData\Microsoft\Windows\Start Menu\Programs\TortoiseHg
** Encoding: ...*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (3.3.2). TortoiseHg version (3.3.2)
** Command:
** CWD: C:\ProgramData\Microsoft\Windows\Start Menu\Programs\TortoiseHg
** Encoding: cp1250
** Extensions loaded:
** 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\repowidget.pyo", line 365, in clearBundle
File "tortoisehg\hgqt\repowidget.pyo", line 396, in clearRevisionSet
File "tortoisehg\hgqt\repowidget.pyo", line 399, in setRevisionSet
File "tortoisehg\hgqt\repomodel.pyo", line 287, in setRevset
File "tortoisehg\hgqt\repomodel.pyo", line 321, in _applyRevsetResult
File "tortoisehg\hgqt\repomodel.pyo", line 261, in _rebuildGraph
File "tortoisehg\hgqt\repomodel.pyo", line 373, in _ensureBuilt
File "tortoisehg\hgqt\graph.pyo", line 874, in build_nodes
File "tortoisehg\hgqt\graph.pyo", line 612, in _iter_graphnodes
File "tortoisehg\hgqt\graph.pyo", line 760, in fromchangectx
File "tortoisehg\hgqt\thgrepo.pyo", line 957, in thgmqappliedpatch
File "tortoisehg\hgqt\thgrepo.pyo", line 949, in _thgmqpatchtags
File "mercurial\context.pyo", line 520, in tags
File "mercurial\localrepo.pyo", line 699, in nodetags
File "mercurial\util.pyo", line 450, in __get__
File "mercurial\localrepo.pyo", line 623, in _tagscache
File "mercurial\localrepo.pyo", line 660, in _findtags
File "mercurial\tags.pyo", line 32, in findglobaltags
File "mercurial\tags.pyo", line 269, in _readtagcache
File "mercurial\bundlerepo.pyo", line 300, in file
File "mercurial\bundlerepo.pyo", line 174, in __init__
File "mercurial\bundlerepo.pyo", line 60, in __init__
LookupError: data/.hgtags.i@8a1bce2ea2b4: unknown parent
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4116'Branch:Include all ancestors` ignored if revset filter is active2020-06-21T10:52:14ZBitbucket Importer'Branch:Include all ancestors` ignored if revset filter is active*Created originally on Bitbucket by [danbst (Danylo Hlynskyi)](https://bitbucket.org/%7Bae553ba2-1bfd-474a-897e-4e9f3866426b%7D/)*
I've changed *Show all* to a specific branch and I've set 'Branch:Include all ancestors` checkbox. So now...*Created originally on Bitbucket by [danbst (Danylo Hlynskyi)](https://bitbucket.org/%7Bae553ba2-1bfd-474a-897e-4e9f3866426b%7D/)*
I've changed *Show all* to a specific branch and I've set 'Branch:Include all ancestors` checkbox. So now I see selected branch commits and commits merged from other branches
When I filter commits by some revset query, like 'public()', workbench shows only selected branch commits.
Would be great if it included ancestor commits when 'Branch:Include all ancestors` is enabled, because now I have to switch current branch to *Show All* for this behavior and append "and ancestors(release)" to queryhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4115shellext: false clean state of icons2020-06-21T10:52:13ZBitbucket Importershellext: false clean state of icons*Created originally on Bitbucket by Anonymous*
After I modified a file in repo and before I hg commit it, the working directory is not "clean".
Inside the software commandline, the state is correct, it will report an error if the com...*Created originally on Bitbucket by Anonymous*
After I modified a file in repo and before I hg commit it, the working directory is not "clean".
Inside the software commandline, the state is correct, it will report an error if the command can't execute when dirty.
But the icon in explorer is still a green "clean" state.It is a false icon.
Here are the screenshots:
![modified.PNG](https://bitbucket.org/repo/48R4X/images/546412864-modified.PNG)
Modified file here. Hadn't hg commit yet.
the file is under directory vim-src-modified/src/
![falseclean.PNG](https://bitbucket.org/repo/48R4X/images/396091742-falseclean.PNG)
the icon is not correct, directory is vim-src-modified/src
![falseclean2.PNG](https://bitbucket.org/repo/48R4X/images/4196101238-falseclean2.PNG)
the icon is still not correct.
I'm using the latest tortoisehg:
![ver.PNG](https://bitbucket.org/repo/48R4X/images/3339757912-ver.PNG)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4106global shelve for repositories with subrepositories2020-06-21T10:52:03ZBitbucket Importerglobal shelve for repositories with subrepositories*Created originally on Bitbucket by [franz haas](https://bitbucket.org/%7B57efb95f-49cb-4c2d-9119-8cac88ea0b30%7D/)*
It would be great to be able to use the shelve, from the master repository to shelve subreposiotry changes as well.
*Created originally on Bitbucket by [franz haas](https://bitbucket.org/%7B57efb95f-49cb-4c2d-9119-8cac88ea0b30%7D/)*
It would be great to be able to use the shelve, from the master repository to shelve subreposiotry changes as well.
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4103Add list of tags and bookmarks to Go to Revision dialog2020-06-21T10:52:00ZBitbucket ImporterAdd list of tags and bookmarks to Go to Revision dialog*Created originally on Bitbucket by [jsmith (Joshua Smith)](https://bitbucket.org/%7Bebaf24bf-73d3-4b5c-8380-8691d9837ee5%7D/)*
Very frequently while I am working I want to find a branch I have bookmarked, most often to merge it with th...*Created originally on Bitbucket by [jsmith (Joshua Smith)](https://bitbucket.org/%7Bebaf24bf-73d3-4b5c-8380-8691d9837ee5%7D/)*
Very frequently while I am working I want to find a branch I have bookmarked, most often to merge it with the my current branch. I don't want to update to that branch, but I do want to navigate to it. Sometimes I know the first part of the bookmark name, but not the whole thing. Currently I either have to scroll through my changesets to find it (which I often don't) or I have to open the Update dialog, find the bookmark to get the changeset number. Then I close the Update dialog, open the Go to Revision dialog and enter the changeset number.
Adding a list of the bookmarks and tags to the go to revision dialog would be a big help.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4100quoting for other than place-holder in [merge-tools] section doesn't work2020-06-21T10:51:57ZBitbucket Importerquoting for other than place-holder in [merge-tools] section doesn't work*Created originally on Bitbucket by [Katsunori FUJIWARA](https://bitbucket.org/%7B74691d40-c973-4cea-923b-e95952360ce2%7D/)*
For example, configuration below doesn't work correctly (maybe "invocation error"), even though it can work wit...*Created originally on Bitbucket by [Katsunori FUJIWARA](https://bitbucket.org/%7B74691d40-c973-4cea-923b-e95952360ce2%7D/)*
For example, configuration below doesn't work correctly (maybe "invocation error"), even though it can work with extdiff:
```
#!
[merge-tools]
kdiff3.diffargs=--L1 "foo bar" --L2 "foo baz" $parent $child
```
As far as I confirm:
* configuration of each merge/diff tools is split by `shlex.split()` in `hglib.difftools()`, and
* split ones are joined by `' '.join()` in `visdiff.launchtool()`, but
* splitting isn't needed (there is no intermediate operation between them)
In `visdiff.launchtool()`, place-holder arguments (e.g. `$parent` and so on) are quoted by `util.shellquote()` while `re.sub()`, but others are not.
IMHO, like fixing for issue4463 of Mercurial, splitting by `shlex.split()` should be avoided.
http://bz.selenic.com/show_bug.cgi?id=4463
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4099Updated dynamic tags not updating in GUI (hg-git)2020-06-21T10:51:56ZBitbucket ImporterUpdated dynamic tags not updating in GUI (hg-git)*Created originally on Bitbucket by [benkehoe (Ben Kehoe)](https://bitbucket.org/%7B408f5114-6231-4850-a498-822cf4672da3%7D/)*
The hg-git extension creates tags for the remote tracking branches (e.g., 'default/master'). After pulling, t...*Created originally on Bitbucket by [benkehoe (Ben Kehoe)](https://bitbucket.org/%7B408f5114-6231-4850-a498-822cf4672da3%7D/)*
The hg-git extension creates tags for the remote tracking branches (e.g., 'default/master'). After pulling, these are updated based on the remote branch. On the command line, the updated tags are shown, but in TortoiseHg, the tags remain in their previous position, including after refreshing, closing (and removing it from the repo registry) and reopening the repository. After closing and reopening TortoiseHg, the tags are shown at their updated positions, but again do not move after subsequent pulls. I'm not sure the release that this behavior started (it used to work), but I'm running 3.0.0 on Ubuntu 14.04.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4095cannot set diff and merge tool when names share the same prefix2020-06-21T10:51:52ZBitbucket Importercannot set diff and merge tool when names share the same prefix*Created originally on Bitbucket by Anonymous*
I work on the development of SimDiff4, a diff and merge tool for Simulink models.
The tool requires passing arguments before each file path.
That is, to compare 2 files it should be cal...*Created originally on Bitbucket by Anonymous*
I work on the development of SimDiff4, a diff and merge tool for Simulink models.
The tool requires passing arguments before each file path.
That is, to compare 2 files it should be called as follows: simdiff4 -l <file_path_1> -r <file_path_2>
I cannot configure such a diff tool in TortoiseHg since I cannot insert the -l and -r options right before the file paths. See the following text from http://mercurial.selenic.com/wiki/ExtdiffExtension that says:
*Each custom diff commands can have two parts: a 'cmd' and an 'opts' part. The cmd.xxx option defines the name of an executable program that will be run, and opts.xxx defines a set of **command-line options which will be inserted to the command between the program name and the files/directories to diff** (i.e. the cdiff example above).*
Therefore, I decided to use a wrapper called toolselector to compare files that calls simdiff4 with proper arguments.
Since I use simdiff4 tool to merge files, I came with the following configuration options:
~~~~
[extensions]
hgext.extdiff =
[extdiff]
cmd.simdiff4_diff = C:\Program Files\EnSoft\SimDiff 4_2_1\utils\toolselector-20120215-1803\toolselector.exe
opts.simdiff4_diff = -profile=mercurial_sd4
[merge-patterns]
**.mdl = simdiff4
**.slx = simdiff4
[merge-tools]
simdiff4.executable = C:\Program Files\EnSoft\SimDiff 4_2_1\simdiff4.exe
simdiff4.args = -b $base -l $local -r $other -o $output
simdiff4.binary = true
simdiff4.gui = true
~~~~
As seen above, I named the diff tool simdiff4_diff and the merge tool simdiff4
I found TortoiseHg fails to invoke toolselector to compare files.
If I name the merge tool simdiff4_merge in the config file then it all works as expected. That is:
~~~~
[merge-patterns]
**.mdl = simdiff4_merge
**.slx = simdiff4_merge
[merge-tools]
simdiff4_merge.executable = C:\Program Files\EnSoft\SimDiff 4_2_1\simdiff4.exe
simdiff4_merge.args = -b $base -l $local -r $other -o $output
simdiff4_merge.binary = true
simdiff4_merge.gui = true
~~~~
My conclusion is that the problem occurs when name for diff and merge tool is same (I also observed this) or one is a prefix of the other (case explained above).
Could you confirm this is a bug?
=============================================
EnSoft Corp.
Sergio Ferrero
Email: sferrero@ensoftcorp.com Web: www.ensoftcorp.com
=============================================https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4093Shelves are damn slow (recalculates working status per file)2020-06-21T10:51:49ZBitbucket ImporterShelves are damn slow (recalculates working status per file)*Created originally on Bitbucket by [danbst (Danylo Hlynskyi)](https://bitbucket.org/%7Bae553ba2-1bfd-474a-897e-4e9f3866426b%7D/)*
thg shelves are very slow. When working directory contains lot of changed files (20-30), shelve operation...*Created originally on Bitbucket by [danbst (Danylo Hlynskyi)](https://bitbucket.org/%7Bae553ba2-1bfd-474a-897e-4e9f3866426b%7D/)*
thg shelves are very slow. When working directory contains lot of changed files (20-30), shelve operation can be 5-7 minutes long
One suggestion is - that is due to largefiles (my repo has ~600 largefiles).
The other suggestion is - that is thg issue. Even one-line changes are shelved via command line twice as fast than via GUI
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4078Detect Copies/Renames sort issue2020-06-21T10:51:31ZBitbucket ImporterDetect Copies/Renames sort issue*Created originally on Bitbucket by [SAnDAnGE (Emanuel Dulan)](https://bitbucket.org/%7Bb78a4c0a-3a59-4de4-a400-02dc961f0504%7D/)*
Steps to reproduce:
1) Open "Detect Copies/Renames" window
2) Click on "Find Renames"
3) Sort Ascend...*Created originally on Bitbucket by [SAnDAnGE (Emanuel Dulan)](https://bitbucket.org/%7Bb78a4c0a-3a59-4de4-a400-02dc961f0504%7D/)*
Steps to reproduce:
1) Open "Detect Copies/Renames" window
2) Click on "Find Renames"
3) Sort Ascending by "Source"
4) Click again on "Find Renames" (new results are not sorted anymore)
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4077AttributeError: 'RepoTreeModel' object has no attribute 'childs'2020-06-21T10:51:29ZBitbucket ImporterAttributeError: 'RepoTreeModel' object has no attribute 'childs'*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (3.3.2). TortoiseHg version (3.3.2)
** Command: --nofork clone --listfile C:\Users\Alex\AppData\Local\Temp\THG571B.tmp
** CWD: C:\Users\Ale...*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (3.3.2). TortoiseHg version (3.3.2)
** Command: --nofork clone --listfile C:\Users\Alex\AppData\Local\Temp\THG571B.tmp
** CWD: C:\Users\Alex\Documents\Unity\Playmaker
** Encoding: cp1252
** Extensions loaded:
** 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\workbench.pyo", line 1069, in closeEvent
File "tortoisehg\hgqt\reporegistry.pyo", line 447, in close
File "tortoisehg\hgqt\reporegistry.pyo", line 311, in _saveSettings
File "tortoisehg\hgqt\reporegistry.pyo", line 401, in _writeExpandedState
File "tortoisehg\hgqt\repotreemodel.pyo", line 342, in itemPath
File "tortoisehg\hgqt\repotreeitem.pyo", line 85, in itempath
AttributeError: 'RepoTreeModel' object has no attribute 'childs'
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4063'show changes from second parent' doesn't work on an uncommited merge2020-06-21T10:51:13ZBitbucket Importer'show changes from second parent' doesn't work on an uncommited merge*Created originally on Bitbucket by Anonymous*
When starting a merge of two revisions, and pressing the button 'commit later' in the merge dialog, the working directory has 2 parents.
In this state, the GUI have 2 buttons designed to ...*Created originally on Bitbucket by Anonymous*
When starting a merge of two revisions, and pressing the button 'commit later' in the merge dialog, the working directory has 2 parents.
In this state, the GUI have 2 buttons designed to show the 'diff' from parent 1 & parent 2
When choosing the working directory and pressing the button to show the diff from parent 2, it shows instead the diff from parent 1.
After the merge is committed, the buttons behave as expected.
I attached images to present the issue
on '1.png', the '1' button is pressed and the correct diff is shown below
on '2.png', the '2' button is pressed and the same diff (as '1') is shown below
on 'after merge 2.png', the '2' button is pressed and the correct diff is shown below
It is easy to replicate this using a new repository. On one file, create a change & commit, roll-back before the change, create a different change & commit, try to merge the 2 commits but press 'commit later' on the last merge dialog.
*Attachments:* [1](/uploads/f34b794791838558aea219ed6dc75606/1.png)[2](/uploads/5f7b8081d3e6207112c095b45a43f7db/2.png)[after_merge_2](/uploads/903c74e462dd1f0198d75677fe3e200d/after_merge_2.png)