Skip to content

Commit 4a24e06

Browse files
committed
Prepare v1.3.0
1 parent c8ea0f0 commit 4a24e06

4 files changed

Lines changed: 76 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
# GitFourchette version history
22

3+
## 1.3.0 (2025-05-03)
4+
5+
**Upgrade note:** The terminal command template now requires the `$COMMAND` argument placeholder. Please review your terminal command in *Settings → External Tools → Terminal*.
6+
7+
New features:
8+
9+
- Custom terminal commands (Settings → Custom Commands) (#37).
10+
- Sidebar: Hide All But This (#49). You can now show a single branch and hide all others.
11+
- Add file to .gitignore or .git/info/exclude from untracked file context menu (#42)
12+
13+
Quality of life improvements:
14+
15+
- GraphView: Conjoined refboxes when a local branch is in sync with its upstream (#12)
16+
- Add target branch shorthand to default merge commit message (#39)
17+
- NewBranchDialog: Pre-tick upstream checkbox if branching off remote branch
18+
- Report mandatory placeholder token errors when launching external tool commands
19+
- Speed up remote listing and upstream lookup
20+
- Fix Sidebar/DiffArea would sometimes jump around by a few pixels while temporary banners were shown
21+
- Override Yaru icon theme's "scary" red warning icon (#27)
22+
- More helpful message if Python bindings for QtSvg are missing
23+
24+
Bug fixes:
25+
26+
- Sidebar: Strip initial slash in nested RefFolder display names (#45)
27+
- Fix Ctrl+G keyboard shortcut on GNOME
28+
- Work around window snapping issue on GNOME (#50)
29+
30+
Two other bug fixes originally introduced in v1.2.0 had been dormant until now due to depending on a pygit2 version bump – they are now in full effect:
31+
32+
- Fix push progress wasn't reported properly during transfer (requires pygit2 1.18.0) (#22)
33+
- Fix push couldn't be canceled once the transfer starts (requires pygit2 1.18.0) (#22)
34+
335
## 1.2.1 (2025-03-05)
436

537
User-suggested quality of life improvements:

gitfourchette/appconsts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# For full terms, see the included LICENSE file.
55
# -----------------------------------------------------------------------------
66

7-
APP_VERSION = "1.2.1"
7+
APP_VERSION = "1.3.0"
88
APP_SYSTEM_NAME = "gitfourchette"
99
APP_DISPLAY_NAME = "GitFourchette"
1010
APP_URL_SCHEME = APP_SYSTEM_NAME

pkg/flatpak/org.gitfourchette.gitfourchette.metainfo.xml

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,13 @@
4545
<screenshots>
4646
<screenshot type="default">
4747
<image>https://gitfourchette.org/_static/appstream/packshot-shadow-light.png</image>
48+
<caption>Exploring a repository in GitFourchette (light mode).</caption>
49+
<caption xml:lang="fr">Exploration d’un dépôt dans GitFourchette (mode clair).</caption>
4850
</screenshot>
4951
<screenshot>
5052
<image>https://gitfourchette.org/_static/appstream/packshot-shadow-dark.png</image>
53+
<caption>Exploring a repository in GitFourchette (dark mode).</caption>
54+
<caption xml:lang="fr">Exploration d’un dépôt dans GitFourchette (mode sombre).</caption>
5155
</screenshot>
5256
</screenshots>
5357

@@ -62,6 +66,40 @@
6266
</keywords>
6367

6468
<releases>
69+
<release version="1.3.0" date="2025-05-03" type="stable">
70+
<url>https://github.com/jorio/gitfourchette/releases/tag/v1.3.0</url>
71+
<description>
72+
<p><em>Upgrade note:</em> The terminal command template now requires the <code>$COMMAND</code> argument placeholder. Please review your terminal command in <em>Settings → External Tools → Terminal</em>.</p>
73+
<p>New features:</p>
74+
<ul>
75+
<li>Custom terminal commands (Settings → Custom Commands) (#37).</li>
76+
<li>Sidebar: Hide All But This (#49). You can now show a single branch and hide all others.</li>
77+
<li>Add file to .gitignore or .git/info/exclude from untracked file context menu (#42)</li>
78+
</ul>
79+
<p>Quality of life improvements:</p>
80+
<ul>
81+
<li>GraphView: Conjoined refboxes when a local branch is in sync with its upstream (#12)</li>
82+
<li>Add target branch shorthand to default merge commit message (#39)</li>
83+
<li>NewBranchDialog: Pre-tick upstream checkbox if branching off remote branch</li>
84+
<li>Report mandatory placeholder token errors when launching external tool commands</li>
85+
<li>Speed up remote listing and upstream lookup</li>
86+
<li>Fix Sidebar/DiffArea would sometimes jump around by a few pixels while temporary banners were shown</li>
87+
<li>Override Yaru icon theme's "scary" red warning icon (#27)</li>
88+
<li>More helpful message if Python bindings for QtSvg are missing</li>
89+
</ul>
90+
<p>Bug fixes:</p>
91+
<ul>
92+
<li>Sidebar: Strip initial slash in nested RefFolder display names (#45)</li>
93+
<li>Fix Ctrl+G keyboard shortcut on GNOME</li>
94+
<li>Work around window snapping issue on GNOME (#50)</li>
95+
</ul>
96+
<p>Two other bug fixes originally introduced in v1.2.0 had been dormant until now due to depending on a pygit2 version bump – they are now in full effect:</p>
97+
<ul>
98+
<li>Fix push progress wasn't reported properly during transfer (requires pygit2 1.18.0) (#22)</li>
99+
<li>Fix push couldn't be canceled once the transfer starts (requires pygit2 1.18.0) (#22)</li>
100+
</ul>
101+
</description>
102+
</release>
65103
<release version="1.2.1" date="2025-03-05" type="stable">
66104
<url>https://github.com/jorio/gitfourchette/releases/tag/v1.2.1</url>
67105
<description>
@@ -123,11 +161,8 @@
123161
<li>Fix DiffView out of sync with rest of RepoWidget after hiding a the currently-selected branch tip</li>
124162
<li>Fix italics in sidebar didn't update after changing the current branch's upstream (a remote-tracking branch in italics means it's the upstream for the current branch)</li>
125163
<li>Fix visual artifacts around character-level diffs in DiffView</li>
126-
</ul>
127-
<p>Bug fixes that will take effect as soon as pygit2 1.17.1 is released:</p>
128-
<ul>
129-
<li>Fix push progress wasn't reported properly during transfer - requires pygit2 1.17.1 (#22)</li>
130-
<li>Fix push couldn't be canceled once the transfer starts - requires pygit2 1.17.1 (#22)</li>
164+
<li>Fix push progress wasn't reported properly during transfer (requires pygit2 1.18.0) (#22)</li>
165+
<li>Fix push couldn't be canceled once the transfer starts (requires pygit2 1.18.0) (#22)</li>
131166
</ul>
132167
<p>Breaking changes:</p>
133168
<ul>

pkg/flatpak/sync_changelog.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ def ensureNewline(s: str):
3434
releases = []
3535

3636
for soupLine in changelogSoup.splitlines():
37+
# Flatpak linter doesn't recognize <strong>, they'll reject the build if the changelog contains one
38+
soupLine = re.sub(r"<(/?)strong>", r"<\1em>", soupLine)
39+
3740
if soupLine.startswith("<h"):
3841
if soupLine.startswith("<h1>"):
3942
continue

0 commit comments

Comments
 (0)