Notices


Reply
Thread Tools
joerg_rw's Avatar
Posts: 2,222 | Thanked: 12,651 times | Joined on Mar 2010 @ SOL 3
#91
Originally Posted by handaxe View Post
Was that path modified by the installation process of that mc version or by you? I ask because if the latter then mc never met the standard outlined (correctly) by you above.
http://wiki.maemo.org/User:Joerg_rw/...bash_and_tools
which is terribly out of date and not in sync with my IroN900 obviously, but anyway serves for answering your question.
__________________
Maemo Community Council member [2012-10, 2013-05, 2013-11, 2014-06 terms]
Hildon Foundation Council inaugural member.
MCe.V. foundation member

EX Hildon Foundation approved
Maemo Administration Coordinator (stepped down due to bullying 2014-04-05)
aka "techstaff" - the guys who keep your infra running - Devotion to Duty http://xkcd.com/705/

IRC(freenode): DocScrutinizer*
First USB hostmode fanatic, father of H-E-N
 

The Following 2 Users Say Thank You to joerg_rw For This Useful Post:
peterleinchen's Avatar
Posts: 4,118 | Thanked: 8,901 times | Joined on Aug 2010 @ Ruhrgebiet, Germany
#92
Originally Posted by reinob View Post
MC will compare the two files which are currently under the cursor (selected, not tagged). This works, at least in my case, consistently fine.
For me that did not work (even I expected it to be this "work flow")!
my version of mc: 4.8.10 (from devel)

HTML Code:
~ $ mc --version
GNU Midnight Commander 4.8.10
Kompiliert mit GLib 2.20.3
Using the S-Lang library with terminfo database
Mit eingebautem Editor
With subshell support as default
Mit Unterstützung für Hintergrundtätigkeiten
Mit Maus-Unterstützung für xterm
Mit Internationalisierungs-Unterstützung
Mit mehrfach Codepage-Unterstützung
Virtuelles Dateisystem: cpiofs, tarfs, sfs, extfs, ftpfs, fish
Datentyp: char: 8; int: 32; long: 32; void *: 32; size_t: 32; off_t: 64;
__________________
SIM-Switcher, automated SIM switching with a Double (Dual) SIM adapter
--
Thank you all for voting me into the Community Council 2014-2016!

Please consider your membership / supporting Maemo e.V. and help to spread this by following/copying this link to your TMO signature:
[MC eV] Maemo Community eV membership application, http://talk.maemo.org/showthread.php?t=94257

editsignature, http://talk.maemo.org/profile.php?do=editsignature
 

The Following 2 Users Say Thank You to peterleinchen For This Useful Post:
joerg_rw's Avatar
Posts: 2,222 | Thanked: 12,651 times | Joined on Mar 2010 @ SOL 3
#93
Originally Posted by peterleinchen View Post
For me that did not work (even I expected it to be this "work flow")!
my version of mc: 4.8.10 (from devel)
and your diff is in path and working? What's the error you get? You didn't tag any files, did you? Diff doesn't work with tagged files afaik, it's sematically ambiguous since you could tag A, B, C on left side and b, f on right side, what diff gonna do? you can diff whole dirs, or a single file left to a single file right - in both cases tagging makes no sense and possibly breaks the diff function

again for clarity, the workflow: move to a dir on left side, move highlight (focus, cursor) to a file in that dir. switch to right side via <tab>, move cursor there to any arbitrary other file. Then <F9> and select "compare files" from commands menu http://wstaw.org/m/2014/04/23/plasma-desktopB31889.png
btw "merge" (F5) seems to yield nonsensical results for me, possibly same/similar problem? [edit] seems F5 doesn't work even on my PC (jr@saturn:~> mc --version GNU Midnight Commander 4.8.10)
__________________
Maemo Community Council member [2012-10, 2013-05, 2013-11, 2014-06 terms]
Hildon Foundation Council inaugural member.
MCe.V. foundation member

EX Hildon Foundation approved
Maemo Administration Coordinator (stepped down due to bullying 2014-04-05)
aka "techstaff" - the guys who keep your infra running - Devotion to Duty http://xkcd.com/705/

IRC(freenode): DocScrutinizer*
First USB hostmode fanatic, father of H-E-N

Last edited by joerg_rw; 2014-04-23 at 19:32.
 

The Following User Says Thank You to joerg_rw For This Useful Post:
Posts: 2,076 | Thanked: 3,268 times | Joined on Feb 2011
#94
Originally Posted by joerg_rw View Post
and your diff is in path and working? What's the error you get? You didn't tag any files, did you? Diff doesn't work with tagged files afaik, it's sematically ambiguous since you could tag A, B, C on left side and b, f on right side, what diff gonna do? you can diff whole dirs, or a single file left to a single file right - in both cases tagging makes no sense and possibly breaks the diff function

again for clarity, the workflow: move to a dir on left side, move highlight (focus, cursor) to a file in that dir. switch to right side via <tab>, move cursor there to any arbitrary other file. Then <F9> and select "compare files" from commands menu http://wstaw.org/m/2014/04/23/plasma-desktopB31889.png
btw "merge" (F5) seems to yield nonsensical results for me, possibly same/similar problem? [edit] seems F5 doesn't work even on my PC (jr@saturn:~> mc --version GNU Midnight Commander 4.8.10)
4.8.10 on jolla, merge works fine it seems (compared two similar files, one with extra line, after merge it got added to the other and asked if to save changes on exit)
 
joerg_rw's Avatar
Posts: 2,222 | Thanked: 12,651 times | Joined on Mar 2010 @ SOL 3
#95
Originally Posted by szopin View Post
4.8.10 on jolla, merge works fine it seems (compared two similar files, one with extra line, after merge it got added to the other and asked if to save changes on exit)
Well, when I try to "merge" two quite different files, it simply replaces one side with the other side. It doesn't ask what to merge, nor does it take sections from both files. Maybe my idea of what's "merge" is flawed. Maybe my test been flawed. Whatever, it works same way on PC and fremantle. So no bug. There are a few flaws in MC (all platforms), like hexedit not available from F4-edit, you need to F3-display the file, then switch from there to "hex" view, then "edit file". Prolly about F5-merge it's similarly tricky

[edit]
https://www.midnight-commander.org/wiki/NEWS-4.8.5
Diff viewer
Bidirectional merge (F5 merge left-to-right, F15 - merge right-to-left) (#2863)
https://www.midnight-commander.org/ticket/2863
mcdiffviewer can merge only from right panel to left panel file.
It will be nice, if -- similar to edit and edit other -- mcdiffviewer can merge hunks into the opposite directions too.
This patch add this feature to mcdiffviewer. With F15 mcdiffviewer merge left panel to right panel direction.
__________________
Maemo Community Council member [2012-10, 2013-05, 2013-11, 2014-06 terms]
Hildon Foundation Council inaugural member.
MCe.V. foundation member

EX Hildon Foundation approved
Maemo Administration Coordinator (stepped down due to bullying 2014-04-05)
aka "techstaff" - the guys who keep your infra running - Devotion to Duty http://xkcd.com/705/

IRC(freenode): DocScrutinizer*
First USB hostmode fanatic, father of H-E-N

Last edited by joerg_rw; 2014-04-23 at 20:29.
 

The Following 2 Users Say Thank You to joerg_rw For This Useful Post:
Posts: 2,076 | Thanked: 3,268 times | Joined on Feb 2011
#96
Originally Posted by joerg_rw View Post
Well, when I try to "merge" two quite different files, it simply replaces one side with the other side. It doesn't ask what to merge, nor does it take sections from both files. Maybe my idea of what's "merge" is flawed. Maybe my test been flawed. Whatever, it works same way on PC and fremantle. So no bug. There are a few flaws in MC (all platforms), like hexedit not available from F4-edit, you need to F3-display the file, then switch from there to "hex" view, then "edit file". Prolly about F5-merge it's similarly tricky
My guess it's just rudimentary, with documentation lacking hard to say. Wow, thanks, didn't know hexedit was possible (going through manpages... undelete? wow, this is really a powertool, sadly no ext2 on jolla, but should work on fremantle)
 

The Following User Says Thank You to szopin For This Useful Post:
peterleinchen's Avatar
Posts: 4,118 | Thanked: 8,901 times | Joined on Aug 2010 @ Ruhrgebiet, Germany
#97
Originally Posted by joerg_rw View Post
and your diff is in path and working? What's the error you get? You didn't tag any files, did you? Diff doesn't work with tagged files afaik, it's sematically ambiguous since you could tag A, B, C on left side and b, f on right side, what diff gonna do? you can diff whole dirs, or a single file left to a single file right - in both cases tagging makes no sense and possibly breaks the diff function

again for clarity, the workflow: move to a dir on left side, move highlight (focus, cursor) to a file in that dir. switch to right side via <tab>, move cursor there to any arbitrary other file. Then <F9> and select "compare files" from commands menu http://wstaw.org/m/2014/04/23/plasma-desktopB31889.png
btw "merge" (F5) seems to yield nonsensical results for me, possibly same/similar problem? [edit] seems F5 doesn't work even on my PC (jr@saturn:~> mc --version GNU Midnight Commander 4.8.10)
Hey joerg,

the work you described is/was exactly the way I expected and tried, to no avail. Error message the same as chill: "2 Dateien sind zum Vergleich erforderlich".

BUT: after adding (preceding) path with /usr/bin/gnu everything works smoothly!
__________________
SIM-Switcher, automated SIM switching with a Double (Dual) SIM adapter
--
Thank you all for voting me into the Community Council 2014-2016!

Please consider your membership / supporting Maemo e.V. and help to spread this by following/copying this link to your TMO signature:
[MC eV] Maemo Community eV membership application, http://talk.maemo.org/showthread.php?t=94257

editsignature, http://talk.maemo.org/profile.php?do=editsignature
 

The Following 4 Users Say Thank You to peterleinchen For This Useful Post:
joerg_rw's Avatar
Posts: 2,222 | Thanked: 12,651 times | Joined on Mar 2010 @ SOL 3
#98
ok, so the solution is obvious and simple:
* fix mc package's dependencies to include the needed gnu* stuff
* provide libslang
* change symlink
Code:
lrwxrwxrwx 1 root root 14 2010-11-11 04:08 /usr/bin/mc -> /opt/mc/bin/mc
to a tiny /usr/bin/mc wrapper shell script something like
Code:
#!/bin/sh
export PATH=/usr/bin/gnu:$PATH 
exec /opt/mc/bin/mc "$@"
__________________
Maemo Community Council member [2012-10, 2013-05, 2013-11, 2014-06 terms]
Hildon Foundation Council inaugural member.
MCe.V. foundation member

EX Hildon Foundation approved
Maemo Administration Coordinator (stepped down due to bullying 2014-04-05)
aka "techstaff" - the guys who keep your infra running - Devotion to Duty http://xkcd.com/705/

IRC(freenode): DocScrutinizer*
First USB hostmode fanatic, father of H-E-N

Last edited by joerg_rw; 2014-04-23 at 22:20.
 

The Following 5 Users Say Thank You to joerg_rw For This Useful Post:
Posts: 1,808 | Thanked: 4,272 times | Joined on Feb 2011 @ Germany
#99
Originally Posted by joerg_rw View Post
* fix mc package's dependencies to include the needed gnu* stuff
I just had a look at the dff_execute function in mc (*). It's horrible. It actually calls "diff" with a whole load of GNU-ishms which busybox will never support.

This is clearly a bug in mc. There are probably other GNU-specific crap everywhere (menu/extensions/etc.) but this is at least fixable. Hard-coding a call to "diff" is so brainfvcked I tempt to stop using mc.

(*) https://www.midnight-commander.org/b...viewer/ydiff.c
 

The Following User Says Thank You to reinob For This Useful Post:
ginggs's Avatar
Posts: 306 | Thanked: 582 times | Joined on Mar 2012
#100
Libslang2 is now in Fremantle Extras, thanks freemangordon!
 

The Following 2 Users Say Thank You to ginggs For This Useful Post:
Reply

Thread Tools

 
Forum Jump


All times are GMT. The time now is 01:17.