Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

savannah: compare files command would be nice to have in mc #120

Closed
mc-butler opened this issue Jan 2, 2009 · 24 comments
Closed

savannah: compare files command would be nice to have in mc #120

mc-butler opened this issue Jan 2, 2009 · 24 comments
Labels
area: core Issues not related to a specific subsystem prio: low Minor problem or easily worked around
Milestone
4.7.2

Comments

@mc-butler
Copy link

Important

This issue was migrated from Trac:

Origin https://midnight-commander.org/ticket/120
Reporter mr_zbiggy
Mentions dborca@….com

Original: http://savannah.gnu.org/bugs/?20739

Submitted by:Zbigniew Luszpinski <mr_zbiggy>Submitted on:Thu 09 Aug 2007 08:45:04 PM UTC
Category:CoreSeverity:3 - Normal
Status:NonePrivacy:Public
Assigned to:NoneOpen/Closed:Open
Release:4.6.1Operating System:GNU/Linux

Original submission:

compare files command would be nice to have in mc. Mc could use 
diff util as an engine by providing paths to files as diff 
arguments and parsing diff output.

This would be very helpful if someone in the future would like to 
add synchronize directories command to mc.

Comment 1 by Pavel Tsekov <ptsekov> at Thu 23 Aug 2007 01:49:25 PM UTC:

You may want to try/test the following patch:

[http://savannah.gnu.org/patch/?5893 patch #5893] - integrated side-by-side textmode diff viewer

Note

Original attachments:
@mc-butler
Copy link
Author

Changed by metux (@metux) on Jan 8, 2009 at 11:40 UTC (comment 1)

  • Priority changed from major to minor
  • Type changed from defect to enhancement

@mc-butler
Copy link
Author

Changed by styx (@styx) on Feb 20, 2009 at 14:05 UTC (comment 2)

  • Milestone set to 4.7

@mc-butler
Copy link
Author

Changed by dborca (dborca@….com) on Mar 27, 2009 at 16:47 UTC

file diff + dir diff against 4.6.2 release

@mc-butler
Copy link
Author

Changed by styx (@styx) on May 29, 2009 at 20:21 UTC (comment 3)

  • Milestone changed from 4.7 to future releases
  • Version 4.6.1 deleted

@mc-butler
Copy link
Author

Changed by dborca (dborca@….com) on Aug 6, 2009 at 23:54 UTC

Quick fixes for 4.7.0-pre1

@mc-butler
Copy link
Author

Changed by dborca (dborca@….com) on Aug 6, 2009 at 23:55 UTC (comment 4)

  • Cc set to dborca@….com
  • Component changed from mcedit to mc-core
  • Severity set to no branch

@mc-butler
Copy link
Author

Changed by angel_il (@ilia-maslakov) on Aug 18, 2009 at 18:08 UTC

@mc-butler
Copy link
Author

Changed by angel_il (@ilia-maslakov) on Aug 18, 2009 at 18:11 UTC (comment 5)

  • Milestone changed from future releases to 4.7.0-pre3

@mc-butler
Copy link
Author

Changed by angel_il (@ilia-maslakov) on Sep 22, 2009 at 11:29 UTC (comment 6)

  • Milestone changed from 4.7.0-pre3 to 4.7.0-pre4

@mc-butler
Copy link
Author

Changed by slavazanko (@slavaz) on Oct 27, 2009 at 9:05 UTC (comment 7)

  • Milestone changed from 4.7.0-pre4 to 4.7

@mc-butler
Copy link
Author

Changed by angel_il (@ilia-maslakov) on Mar 4, 2010 at 4:29 UTC (comment 8)

  • Severity changed from no branch to on rework
  • Milestone changed from 4.7 to 4.7.2

branch: 120_diff_view

@mc-butler
Copy link
Author

Changed by angel_il (@ilia-maslakov) on Apr 6, 2010 at 13:10 UTC (comment 9)

  • Severity changed from on rework to on review

initial changeset: [78ef198acae7d907ce876fda40bb705227492698]

please review

@mc-butler
Copy link
Author

Changed by angel_il (@ilia-maslakov) on Apr 19, 2010 at 7:28 UTC (comment 10)

  • Status changed from new to accepted
  • Owner set to angel_il

initial commit: [07d1eb0019950d70252789fd93c48ea5534485c4]
branch: 120_diff_view

@mc-butler
Copy link
Author

Changed by slavazanko (@slavaz) on Apr 26, 2010 at 9:09 UTC (comment 11)

  • Votes set to slavazanko

@mc-butler
Copy link
Author

Changed by angel_il (@ilia-maslakov) on Apr 26, 2010 at 10:43 UTC (comment 12)

  • Votes changed from slavazanko to slavazanko angel_il

initial commit: [329ef38]

@mc-butler
Copy link
Author

Changed by andrew_b (@aborodin) on Apr 27, 2010 at 7:00 UTC (comment 13)

  • Version set to master
  • Votes changed from slavazanko angel_il to slavazanko andrew_b
  • Severity changed from on review to approved

@mc-butler
Copy link
Author

Changed by angel_il (@ilia-maslakov) on Apr 27, 2010 at 9:42 UTC (comment 14)

  • Status changed from accepted to testing
  • Resolution set to fixed
  • Votes changed from slavazanko andrew_b to committed-master
  • Severity changed from approved to merged

merged: [8e33a5b]

@mc-butler
Copy link
Author

Changed by dborca (dborca@….com) on Apr 27, 2010 at 18:56 UTC (comment 14.15)

Replying to angel_il:

merged: [8e33a5b]

There is a subtle bug in horizontal diff:

1126	                        if ((*p)[0] == off0)
1127	                        {
1128	                            break;
1129	                        }
1130	                        if ((*p)[1] == off1)
1131	                        {
1132	                            break;
1133	                        }

Because (*p)[0] dictates order and (*p)[1] must be monotonic with respect to that:

1126	                        if ((*p)[0] == off0)
1127	                        {
1128	                            break;
1129	                        }
1130	                        if ((*p)[1] >= off1)
1131	                        {
1132	                            break;
1133	                        }

Test case: abcdefghij <-> fghijabcde

@mc-butler
Copy link
Author

Changed by dborca (dborca@….com) on Apr 27, 2010 at 19:00 UTC

@mc-butler
Copy link
Author

Changed by dborca (dborca@….com) on Apr 27, 2010 at 19:07 UTC (comment 16)

xdiff = Binary diff (ala vbindiff), just for the sake of it.

@mc-butler
Copy link
Author

Changed by andrew_b (@aborodin) on Apr 29, 2010 at 7:16 UTC (comment 17)

#2159: fix of rpm spec.

@mc-butler
Copy link
Author

Changed by angel_il (@ilia-maslakov) on May 1, 2010 at 7:21 UTC (comment 15.18)

  • Status changed from testing to closed

Replying to dborca:

Replying to angel_il:

merged: [8e33a5b]

There is a subtle bug in horizontal diff:

1126	                        if ((*p)[0] == off0)
1127	                        {
1128	                            break;
1129	                        }
1130	                        if ((*p)[1] == off1)
1131	                        {
1132	                            break;
1133	                        }

Because (*p)[0] dictates order and (*p)[1] must be monotonic with respect to that:

1126	                        if ((*p)[0] == off0)
1127	                        {
1128	                            break;
1129	                        }
1130	                        if ((*p)[1] >= off1)
1131	                        {
1132	                            break;
1133	                        }

Test case: abcdefghij <-> fghijabcde

fixed: [bc0ad94]

about xdiff i think need new ticket...

@mc-butler
Copy link
Author

Changed by ossi (@ossilator) on Jan 11, 2014 at 23:23 UTC (comment 19)

  • Branch state set to no branch
  • Description edited
  • Reporter changed from slavazanko to mr_zbiggy

@mc-butler
Copy link
Author

Changed by andrew_b (@aborodin) on Jan 12, 2014 at 7:46 UTC (comment 20)

  • Branch state changed from no branch to merged

@mc-butler mc-butler mentioned this issue Sep 21, 2011
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
area: core Issues not related to a specific subsystem prio: low Minor problem or easily worked around
Milestone
4.7.2
Development

No branches or pull requests
1 participant
@mc-butler