- 01 Feb, 2020 1 commit
-
-
Aay Jay Chan authored
This caused a crash when opening diff tool. --HG-- branch : stable
-
- 31 Jan, 2020 1 commit
-
-
Yuya Nishihara authored
--HG-- branch : stable
-
- 30 Jan, 2020 3 commits
-
-
Matt Harbison authored
I started in here after seeing `b'orphan'` above the commit message, but there were other attributes that had issues here. I tested the convert revision, but I don't have the ability to test the svn or p4 variants. The MQ one is suspicious because `thgmqoriginalparent()` returns '' in the error case, but if there are patches applied, it reached into core mercurial, so it probably also returns bytes. --HG-- branch : stable
-
Matt Harbison authored
This caused a crash when clicking on a revision that changed a subrepo. --HG-- branch : stable
-
Manuel Jacob authored
--HG-- branch : stable
-
- 28 Jan, 2020 2 commits
-
-
Matt Harbison authored
I stayed with the Qt5.9 branch because it is still supported for now. The PyQt5 documentation says to always use the latest version, and not worry about keeping it in sync with Qt5. SourceForge is lagging behind with some of these packages, so I moved them to the official download site. Not sure if this is a great idea long term, because I don't see an archive page. But we were already relying on this site for sip. Something (Qt5?) wanted `enum34` installed. So the package installation had to be moved to immediately after building python. Additionally, sip needed to be configured differently, otherwise this version of PyQt5 couldn't find it, and QScintilla failed to build.
-
Matt Harbison authored
OpenSSL 1.0.2 is now EOL, but newer versions contain API changes. The other dependencies are an intertwined mess, so doing those separately.
-
- 29 Jan, 2020 1 commit
-
-
Matt Harbison authored
Otherwise signing the overall bundle fails complaining that this item isn't signed at all.
-
- 28 Jan, 2020 1 commit
-
-
Matt Harbison authored
Qt4 support ended in December 2015. Given how new OS releases routinely break things, it's doubtful this still works.
-
- 30 Jan, 2020 1 commit
-
-
Yuya Nishihara authored
-
- 27 Jan, 2020 2 commits
-
-
Matt Harbison authored
Manually changing this is a nuisance. The CFBundle strings are supposed to be in x.y.z format (though from experience, nothing seems to care), so leverage the existing method for generating the MSI value.
-
Matt Harbison authored
-
- 24 Jan, 2020 6 commits
-
-
Matt Harbison authored
The scripts download and/or build all of the required dependencies, create a virtualenv to install them, and then build the app bundle from there. They expect a `thg` and `hg` repo in `contrib/packaging/macos/src`, so to build for now, add a symlink back to the repo root, and symlink to a local Mercurial repo. Then run `build.sh` from that directory. With Bitbucket going away, I think it's important to capture this as-is for reference before integrating it more tightly. This is unmodified from my latest pull request to fix a build failure[1] (followed by some cleanup by Sam Hathaway and me), except that I adjusted the `background.png` and `TortoiseHg.icns` to keep it working, and I generated a requirements file for the external python packages based on what the script installed to successfully build 5.3rc0. Also for whatever reason, OpenSSL fails to link on my system with Xcode 10 installed. The errors are mostly around _OBJ_xxx symbols like _OBJ_txt2obj and _OBJ_sigid_free being missing. I have no idea why this is, and the command line tools work fine, so build_settings.conf is adjusted to use the command line tools if they are installed. The next steps are to get rid of some of the cruft (Qt4, the separate setup.py, and so forth). I had some success building a py3 .app with some modifications, so this may end up being more than an historical reference when py2 support is dropped. (Sadly the py3 app crashed on startup, complaining about some missing imports. But so did a manually built .app using setup.py in the repo root.) [1] https://groups.google.com/forum/#!msg/thg-dev/vD6mbg3DTmg/1HoU6UdUBwAJ
-
Matt Harbison authored
-
Matt Harbison authored
-
Matt Harbison authored
I plan on vendoring the Mac build scripts here. I also plan on a (hopefully) much simplified set of release scripts for Windows. So it makes sense to organize this roughly like Mercurial has.
-
Matt Harbison authored
Mostly this is adding PyQt5 support, but now also includes certifi (because modern python needs it on macOS) and iniparse to edit preferences. The reference config is in setup.py in another repo for now[1]. The one thing it still doesn't do is add a module that extends `sys.path` to include the user's site-packages directory. [1] https://bitbucket.org/Weeds2000/tortoisehg-osx-build-scripts/pull-requests/1/additional-build-improvements/commits
-
Matt Harbison authored
This regressed in 4b2cc31ccaaf, because there is no `tv` attribute on `MatchTree`. The remaining reference to `tv` in that change seems legit.
-
- 23 Jan, 2020 2 commits
-
-
Matt Harbison authored
Without auto-merge, the merge/shelve/discard prompt is shown, whether the update is a local merge or across topological heads. If selected, it isn't shown for local merges, so it shouldn't be for merges to other branches either for consistency. But these merges require the `--merge` argument to succeed.
-
Matt Harbison authored
The ability to merge uncommitted updates across topological heads has been supported since Mercurial 4.2.
-
- 14 Jan, 2020 2 commits
-
-
Yuya Nishihara authored
-
Manuel Jacob authored
Changeset 43aaee95a027 added the functionality that the revdetails widget is reloaded when the repository changes. This caused a FilteredRepoLookupError when hiding hidden changesets while a hidden changeset is selected. --HG-- branch : stable
-
- 08 Jan, 2020 1 commit
-
-
Manuel Jacob authored
--HG-- branch : stable
-
- 10 Dec, 2019 4 commits
-
-
Yuya Nishihara authored
--HG-- branch : stable
-
Yuya Nishihara authored
Spotted while adding type annotation. --HG-- branch : stable
-
Yuya Nishihara authored
Spotted while adding type annotation. --HG-- branch : stable
-
Yuya Nishihara authored
For now, repo and ctx are typed as Any.
-
- 09 Dec, 2019 1 commit
-
-
Yuya Nishihara authored
Hopefully this will detect future type mismatches.
-
- 15 Dec, 2019 5 commits
-
-
Matt Harbison authored
-
Matt Harbison authored
This is what core Mercurial does in dispatch._callcatch(), and fixes commands like: thg v
-
Matt Harbison authored
This is what core Mercurial does in dispatch._parse(), and fixes commands like: thg --cwd C:\dummyrepo init
-
Matt Harbison authored
I suppose it works passing a magic str and everything else is bytes, but that initially confused me into coercing an exception to a str in the `_runcatch()` handler.
-
Matt Harbison authored
This handler is quite similar to dispatch._callcatch(), and it will be easier to see differences if the common parts line up.
-
- 12 Dec, 2019 1 commit
-
-
Yuya Nishihara authored
-
- 11 Dec, 2019 3 commits
-
-
Matt Harbison authored
Fixes the following pytype warning: line 1290, in generateSingleMenu: No attribute 'setData' on None [attribute-error] In Optional[Union[Any, PyQt5.QtWidgets.QAction]] The only way a None return is possible is if the 3rd arg is not None.
-
Matt Harbison authored
-
Matt Harbison authored
Fixes the following errors flagged by pytype: line 387, in onCompletion: Function bytes.split was called with the wrong arguments [wrong-arg-types] Expected: (self, sep: Optional[bytes] = ..., ...) Actually passed: (self, sep: str) line 390, in onCompletion: Function bytes.split was called with the wrong arguments [wrong-arg-types] Expected: (self, sep: Optional[bytes] = ..., ...) Actually passed: (self, sep: str) line 398, in onCompletion: Function bytes.split was called with the wrong arguments [wrong-arg-types] Expected: (self, sep: Optional[bytes] = ..., ...) Actually passed: (self, sep: str)
-
- 09 Dec, 2019 3 commits
-
-
Matt Harbison authored
-
Matt Harbison authored
-
Matt Harbison authored
Mostly I wanted to fix the COMMETHOD lists so that the next patch was reviewble, but I figured I'd fix the other PEP8 violations that pycharm was complaining about. I did leave a few extra long message strings alone because they're more readable as-is.
-