Rename SVN to GIT throughout the codebase - #726
Merged
Conversation
aMule moved off SVN to git years ago; the source still carried "SVN"
as the dev-build placeholder in:
- PACKAGE_STRING / PACKAGE_VERSION CMake defaults
- the __SVN__ preprocessor flag (dev-build marker)
- the SVNDATE CMake variable and #cmakedefine, both consumed by
MuleVersion.h / amule.cpp / amuleDlg.cpp / amule-gui.cpp /
ExternalConnector.cpp to compose the runtime "Snapshot:" trailer
- MOD_VERSION_LONG = "aMule SVN" runtime user-visible string
- the new-version greeting check at amule.cpp:1236
- scripts/update-po.sh xgettext --package-version
Renames:
SVN -> GIT (PACKAGE_VERSION, PACKAGE_STRING values)
__SVN__ -> __GIT__ (preprocessor flag)
SVNDATE -> GITDATE (CMake var + C macro)
"aMule SVN" -> "aMule GIT" (MOD_VERSION_LONG default)
Also drops the unused \${SVN_REVISION} reference at CMakeLists.txt:413
(never set anywhere). Configure summary now reads "Configured aMule GIT
for ..." on snapshot builds; tagged-release builds remain unchanged
(PACKAGE_VERSION still overridden to the tag name).
Historical SVN-era date references in src/ClientList.cpp:690 and
src/SafeFile.cpp:555 are preserved verbatim -- those are factual
references to specific SVN-era commits ("aMule SVN 2008-05-09" /
"aMule prior to SVN 26/02/2005"), not placeholders.
Verified on macOS: build clean, configure summary reads
"Configured aMule GIT for 'Darwin-25.4.0' on 'arm64'.", runtime banner
reads "aMuleD GIT compiled with wxBase(OSX Cocoa) v3.3.2 and Boost 1.90
(Snapshot: rev. 2.3.3-481-gfe4e28709)".
Fixes amule-project#722.
3 tasks
ngosang
added a commit
to ngosang/amule
that referenced
this pull request
Jul 30, 2026
) The identity filter on the client tables treated ident_state as a boolean, but the daemon emits six distinct values (ClientIdentStateName in src/webapi/Refresher.cpp). "Not identified" was implemented as `ident_state !== "identified"`, a catch-all merging unsupported, pending, failed and bad-guy peers, with no way to isolate any of them. Web UI: - Drive the filter options from IDENT_STATES, 1:1 with the daemon's value set, so the comparison collapses to a plain equality test. The duplicated two-branch condition in clients.js and client-table.js is gone. - Default the filter to "all" in the Clients view. It defaulted to "identified", so the table opened pre-filtered while the tab badges counted every peer, and could look empty while the tab said 3. FileClients already defaulted to "all". - Add an Ident column (badge, sortable, hidden by default) so the full state is readable, not just inferable from the presence of an icon. - Show the warning icon for id_failed too. A signature that failed verification looked identical to a peer with no SecIdent at all. - Add the missing downloads_peer_state_connected label. DS_CONNECTED is reachable, so the DL state column rendered the raw key "downloads_peer_state_connected". Drop the orphan _undefined key and the three ident labels misfiled under the transfer-state prefix. API docs, same class of defect found while auditing the rest of the client fields: - ident_state was documented as "verified", obfuscation_status as "obfuscated" and software as "eMule" in all three example blocks. None of those values can be emitted; the field sets themselves were complete and correct. - Enumerate the legal values of upload_state, download_state, ident_state, obfuscation_status, software and source_origin, plus the "unknown" fallback rule. Nothing enumerated them before, which is how the fabricated example values survived. - Fix the stale obfuscation_status and ident_state comments in State.h.
got3nks
added a commit
to got3nks/amule
that referenced
this pull request
Jul 30, 2026
The trailing comments on ident_state and obfuscation_status went past the column limit when amule-project#726 added the "unknown" value to each, and score's comment kept an old alignment. The clang-format gate is whole-tree over src/, so this left master red and every branch cut from it inheriting the failure. Formatting only, no semantic change. Verified as a clang-format fixpoint (three consecutive passes identical), and src/ is clean tree-wide after it.
got3nks
pushed a commit
to got3nks/amule
that referenced
this pull request
Jul 31, 2026
…r.cpp (amule-project#675) (amule-project#725) * chore(gui): delete unreachable bitmap functions/entries from muuli_wdr.cpp First slice of the icon-system cleanup scoped in amule-project#675: remove code with zero call sites anywhere in the tree, before any wxArtProvider migration work starts. - muleToolbar(): whole function unused -- superseded by the main wxToolBar setup in amuleDlg.cpp; nothing calls it. - moreImages(): whole function unused, both of its two icon entries. - amuleDlgImages(): 21 of 35 index blocks have no caller anywhere (0-13, 16, 17, 19, 27, 28, 31, 34). The 14 live ones are untouched -- 10 of those (20-26, 29, 32, 33) are already the fallback path inside amuleDlg.cpp's Add_Skin_Icon, which prefers a wxArtProvider/SVG lookup first; the other 4 (14, 15, 18, 30) are still called directly. - amuleSpecial(): 6 of 26 index blocks have no caller (6, 7, 8, 9, 18, 20) -- checked both direct call sites and the PrefsUnifiedDlg.cpp fallback table (pages[].m_imageidx), which uses neither. convert_xpm in PartFileConvertDlg.cpp was on the same "no literal grep hits" list initially but is not actually dead -- SetIcon(wxICON (convert)) reaches it via the wxICON macro's token-pasting (X##_xpm), invisible to a plain identifier search. Caught by a full build failing on the undeclared identifier, not by inspection; left untouched. Deletes 1373 lines (~16% of the file). No behavior change: every touched entry was unreachable code. clang-format v18 clean; full amule build verified (macOS, CLIENT_GUI unaffected since neither touched symbol is CLIENT_GUI-only). * chore(po): regenerate catalogs after muuli_wdr.cpp dead-code removal muleToolbar() duplicated several msgid source-location references (Networks, Searches, Downloads Window, etc.) already present via amuleDlg.cpp's own toolbar setup. Deleting it drops those now-stale #: comments; no msgid added, removed, or retranslated -- verified via unchanged msgid count (1903 before/after) and a diff limited to source-location comments and POT-Creation-Date. Regenerated after rebasing onto upstream/master to pick up po/ changes from amule-project#723/amule-project#724/amule-project#726/amule-project#728/amule-project#730/amule-project#731, which had drifted our prior regeneration out of sync.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #722.
As @Vollstrecker noted on #722, aMule moved off SVN years ago — the placeholder is leftover from that era. There was already a partial inconsistency in the source:
VERSIONwas"GIT"butPACKAGE_VERSION/PACKAGE_STRINGweren't.Mechanical rename across the relevant surfaces:
PACKAGE_VERSION "SVN"/PACKAGE_STRING "aMule SVN""GIT"/"aMule GIT"MOD_VERSION_LONG "aMule SVN""aMule GIT"__SVN____GIT__SVNDATEGITDATE#cmakedefinein config.h.cm; consumed by MuleVersion.h, amule.cpp, amuleDlg.cpp, amule-gui.cpp, ExternalConnector.cpp--package-version='SVN''GIT'if (new_version == "SVN")== "GIT"VERSION-was-GITgreeting at amule.cpp:1236, now actually fires for dev buildsAlso drops the unused
${SVN_REVISION}reference atCMakeLists.txt:413— never set anywhere.Historical SVN-era date markers preserved:
ClientList.cpp:690("aMule SVN 2008-05-09") andSafeFile.cpp:555("aMule prior to SVN 26/02/2005") are factual references to specific commits, not placeholders. Left untouched.Verification
Configured aMule SVN for ...Configured aMule GIT for ...amuled --versionaMuleD SVN compiled with ... (Snapshot: rev. …)(only theSVNtoken was a dev placeholder)aMuleD GIT compiled with wxBase(OSX Cocoa) v3.3.2 and Boost 1.90 (Snapshot: rev. 2.3.3-481-gfe4e28709)Tagged-release builds are unaffected: the same CMake block continues to override
PACKAGE_VERSIONto the tag name andunset (GITDATE)to suppress the(Snapshot: …)trailer on release builds.Test plan
cmake -B build-svnrename …thencmake --build, 17 files modified, +61/−60).Configured aMule GIT for ...on snapshot HEAD.amuled --versionshowsaMuleD GIT … (Snapshot: rev. …).