Author Topic: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk  (Read 5426 times)

Offline omlk

  • Multiple posting newcomer
  • *
  • Posts: 58
FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« on: December 23, 2020, 11:26:48 am »
If need  ;) I attach files for FileManager Plugin wx3.1.x (64 bit) with my upgrade:
  • fix if drag items is null
  • fix event on key Del press
  • add checks when drag files: move or copy with prevent replace
  • add checks when click move or copy from context menu with prevent replace
« Last Edit: May 05, 2021, 02:17:07 am by omlk »

Offline oBFusCATed

  • Developer
  • Lives here!
  • *****
  • Posts: 13338
    • Travis build status
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #1 on: December 23, 2020, 12:01:54 pm »
I know you don't want to read much or cooperate with us, but if you decide to change your mind sometime in the future you could check this link: http://wiki.codeblocks.org/index.php/Creating_a_patch_to_submit_(Patch_Tracker)
(most of the time I ignore long posts)
[strangers don't send me private messages, I'll ignore them; post a topic in the forum, but first read the rules!]

Offline omlk

  • Multiple posting newcomer
  • *
  • Posts: 58
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #2 on: December 23, 2020, 12:39:01 pm »

Offline omlk

  • Multiple posting newcomer
  • *
  • Posts: 58
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #3 on: December 23, 2020, 12:41:23 pm »
I know you don't want to read much or cooperate with us, but if you decide to change your mind sometime in the future you could check this link: http://wiki.codeblocks.org/index.php/Creating_a_patch_to_submit_(Patch_Tracker)
Okay, I'll read how to make patches.  :)

Offline omlk

  • Multiple posting newcomer
  • *
  • Posts: 58
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #4 on: May 05, 2021, 01:52:15 am »
FileManager Plugin wx3.1.x (64 bit) with my upgrade: svn 12295
  • Add: fast button clear masks
  • Fixed: collapse and expand items, cursor icons
  • More: many fixes and edits to improve the code and performance of the plugin
« Last Edit: May 05, 2021, 02:13:59 am by omlk »

Offline Miguel Gimenez

  • Lives here!
  • ****
  • Posts: 718
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #5 on: May 05, 2021, 05:00:55 pm »
You should post a proper patch, not the whole folder content. In fact, File Manager has changed since 12295 (see commits 12312, 12318 and 12319), so replacing the files is not possible.

Offline omlk

  • Multiple posting newcomer
  • *
  • Posts: 58
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #6 on: May 05, 2021, 07:56:49 pm »
You should post a proper patch, not the whole folder content. In fact, File Manager has changed since 12295 (see commits 12312, 12318 and 12319), so replacing the files is not possible.
I svn up to 12295(with merge) and many more edits in codeblocks project, so I don't know how to make a patch for one plugin folder, if someone gives an example of how to do it, then I'll try and where to send this patch?
If I could create a new svn brunch for omlk repository, I would post changes there, but I don't have access. 

Also I think my code is much better than edits in commit: 12312, 12318 and 12319
« Last Edit: May 06, 2021, 06:40:32 am by omlk »

Offline oBFusCATed

  • Developer
  • Lives here!
  • *****
  • Posts: 13338
    • Travis build status
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #7 on: May 05, 2021, 10:07:54 pm »
Here is an explanation how to make patches from svn: https://wiki.codeblocks.org/index.php/Creating_a_patch_to_submit_(Patch_Tracker)
You cannot make branches in svn, because you're not developer and branches in svn are heavy.
You can use git to do it (if you're more familiar with git) and base your branch on the master branch in https://github.com/obfuscated/codeblocks_sf

Edit: Just a hint for better success: If you can post a patch per fix it will ease the review process.
« Last Edit: May 05, 2021, 10:10:00 pm by oBFusCATed »
(most of the time I ignore long posts)
[strangers don't send me private messages, I'll ignore them; post a topic in the forum, but first read the rules!]

Offline omlk

  • Multiple posting newcomer
  • *
  • Posts: 58
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #8 on: May 06, 2021, 06:33:39 am »
Here is an explanation how to make patches from svn: https://wiki.codeblocks.org/index.php/Creating_a_patch_to_submit_(Patch_Tracker)
You cannot make branches in svn, because you're not developer and branches in svn are heavy.
You can use git to do it (if you're more familiar with git) and base your branch on the master branch in https://github.com/obfuscated/codeblocks_sf
Edit: Just a hint for better success: If you can post a patch per fix it will ease the review process.
Code
$ svn diff -r PREV --summarize > omlk_12295.path
svn: E135000: File '/h/i/CB_src/s_merge - my12295/trunk/src/plugins/codecompletion/parser/cclogger.h' has inconsistent newlines
svn: E135000: Inconsistent line ending style
svn: E200042: Additional errors:
svn: E135000: Inconsistent line ending style
Code
$ svn diff -x '-b --ignore-eol-style' -r PREV --summarize > omlk_12295.path
svn: E135000: File '/h/i/CB_src/s_merge - my12295/trunk/src/plugins/codecompletion/parser/cclogger.h' has inconsistent newlines
svn: E135000: Inconsistent line ending style
svn: E200042: Additional errors:
svn: E135000: Inconsistent line ending style

Offline Miguel Gimenez

  • Lives here!
  • ****
  • Posts: 718
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #9 on: May 06, 2021, 09:35:34 am »
Quote
Any ideas on how to fix this for a large number of files?

unix2dos * will do it in the current folder, if you need to change subfolders use find . -type f -print0 | xargs -0 unix2dos. Be careful, some files use Unix EOL.

You can generate a patch just using

Code
svn diff > omlk_12295.patch

unless you really need the reverse patch

Offline omlk

  • Multiple posting newcomer
  • *
  • Posts: 58
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #10 on: May 07, 2021, 09:26:34 am »
Code
$ svn diff -x '-b --ignore-eol-style' ./src/plugins/contrib/FileManager/ > omlk_12295_FileManager_rev0.3.path
File attached to this post.

Offline oBFusCATed

  • Developer
  • Lives here!
  • *****
  • Posts: 13338
    • Travis build status
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #11 on: May 07, 2021, 12:05:01 pm »
Interesting:
1. wild reformatting changes for no apparent reason, uses tabs instead of spaces
2. switches to c++20, but still uses goto
3. fails to apply cleanly on latest trunk/master:
Code
> patch -p0 < /tmp/omlk_12295_FileManager_rev0.3.path
patching file src/plugins/contrib/FileManager/FileExplorer.cpp
Hunk #34 FAILED at 762.
Hunk #52 succeeded at 1295 with fuzz 2.
Hunk #53 succeeded at 1305 (offset 1 line).
Hunk #54 FAILED at 1329.
Hunk #55 succeeded at 1366 (offset 3 lines).
Hunk #56 succeeded at 1385 (offset 3 lines).
Hunk #57 FAILED at 1395.
Hunk #58 FAILED at 1512.
4 out of 58 hunks FAILED -- saving rejects to file src/plugins/contrib/FileManager/FileExplorer.cpp.rej
patching file src/plugins/contrib/FileManager/FileExplorer.h
patching file src/plugins/contrib/FileManager/FileManager_wx31_64.cbp
patching file src/plugins/contrib/FileManager/se_globals.cpp
patching file src/plugins/contrib/FileManager/se_globals.h

This would be rough...
(most of the time I ignore long posts)
[strangers don't send me private messages, I'll ignore them; post a topic in the forum, but first read the rules!]

Offline omlk

  • Multiple posting newcomer
  • *
  • Posts: 58
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #12 on: May 07, 2021, 01:21:52 pm »
  • I don't understand what's wrong with the patch yet? The patch should be set to r12295.
  • What's wrong with goto?
I attached new patch include fixes from r12319, r12318
« Last Edit: May 07, 2021, 10:40:07 pm by omlk »

Offline oBFusCATed

  • Developer
  • Lives here!
  • *****
  • Posts: 13338
    • Travis build status
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #13 on: May 07, 2021, 04:39:06 pm »
I don't understand what's wrong with the patch yet? The patch should be set to r12295.
What do you mean by "set to r12295". The idea is to update to the latest trunk commit, make your changes and then create the patch.
If you're more comfortable with git you can use https://github.com/obfuscated/codeblocks_sf

What's wrong with goto?
https://homepages.cwi.nl/~storm/teaching/reader/Dijkstra68.pdf
(most of the time I ignore long posts)
[strangers don't send me private messages, I'll ignore them; post a topic in the forum, but first read the rules!]

Offline Commaster

  • Multiple posting newcomer
  • *
  • Posts: 115
Re: FileManager Plugin wx3.1.x (64 bit) upgrade by omlk
« Reply #14 on: May 07, 2021, 05:21:02 pm »
(Offtopic) Also it's patch, not path: https://en.wikipedia.org/wiki/Patch_(computing)