Nabble - Gnome - Meld - General

2009/11/24 M. Bashir Al-Noimi mbnoimi@...
  
Hi All,

Because I found that meld is smart I use it, but yesterday I faced something
strange during comparing two XML files (see the attachments please).

Although the first file (english.xml) is too different from the second file
(arabic.xml) meld splits these differences in to huge blocks where they must
be small blocks!!! (see the pic below).

How I can deal with this problem? I want to make meld recognize these
differences accurately.
    

Looking at your example comparison, I can't see the problem. It looks
to me like the changes between the files are correctly highlighted.
  
Can you be more specific about what you would expect to see?
  
[meld-multiple-diffs-patch.patch]
diff -u -r meld.orig/meldapp.py meld/meldapp.py

--- meld.orig/meldapp.py	2009-09-16 17:19:16.000000000 -0600

+++ meld/meldapp.py	2009-09-16 18:15:40.000000000 -0600

@@ -842,7 +842,10 @@

     %prog <dir>                 Start with VC browser in 'dir'

     %prog <file>                Start with VC diff of 'file'

     %prog <file> <file> [file]  Start with 2 or 3 way file comparison

-    %prog <dir>  <dir>  [dir]   Start with 2 or 3 way directory comparison""",

+    %prog <dir>  <dir>  [dir]   Start with 2 or 3 way directory comparison

+    

+    Multiple diffs may be separated with "-".

+    """,

     description="""Meld is a file and directory comparison tool.""",

     version="%prog "+version)

     parser.add_option("-L", "--label", action="append", default=[], help=_("Set label to use instead of file name"))

@@ -854,30 +857,42 @@

 

     app = MeldApp()

     tab = None

-

-    if len(args) == 0:

-        pass

-

-    elif len(args) == 1:

-        a = args[0]

-        if os.path.isfile(a):

-            doc = vcview.VcView(app.prefs)

-            def cleanup():

-                app.scheduler.remove_scheduler(doc.scheduler)

-            app.scheduler.add_task(cleanup)

-            app.scheduler.add_scheduler(doc.scheduler)

-            doc.set_location( os.path.dirname(a) )

-            doc.connect("create-diff", lambda obj,arg: app.append_diff(arg) )

-            doc.run_diff([a])

-        else:

-            tab = app.append_vcview( [a] )

-                

-    elif len(args) in (2,3):

-        tab = app.append_diff(args)

+    

+    if '-' in args:

+        ##

+        ## There are multiple diffs, separated by '-'

+        argParts = []

+        working = args

+        while '-' in working:

+            argParts.append(working[:working.index('-')])

+            working = working[working.index('-')+1:]

+        argParts.append(working)

     else:

-        app.usage( _("Wrong number of arguments (Got %i)") % len(args))

-

-    if tab:

-        tab.set_labels( options.label )

+        argParts = [args]

+    

+    for args in argParts:

+        if len(args) == 0:

+            pass

+        elif len(args) == 1:

+            a = args[0]

+            if os.path.isfile(a):

+                doc = vcview.VcView(app.prefs)

+                def cleanup():

+                    app.scheduler.remove_scheduler(doc.scheduler)

+                app.scheduler.add_task(cleanup)

+                app.scheduler.add_scheduler(doc.scheduler)

+                doc.set_location( os.path.dirname(a) )

+                doc.connect("create-diff", lambda obj,arg: app.append_diff(arg) )

+                doc.run_diff([a])

+            else:

+                tab = app.append_vcview( [a] )

+                    

+        elif len(args) in (2,3):

+            tab = app.append_diff(args)

+        else:

+            app.usage( _("Wrong number of arguments (Got %i)") % len(args))

+    

+        if tab:

+            tab.set_labels( options.label )

     app.main()

 

Binary files meld.orig/meldapp.pyc and meld/meldapp.pyc differ



Nabble - Gnome - Meld - General

Re: Commit only some changes

Re: Commit only some changes

Re: Commit only some changes

Re: Commit only some changes

Re: meld stopped working when run as root

Re: meld stopped working when run as root

Re: meld stopped working when run as root

Re: meld stopped working when run as root

Re: Smart Recognition

Re: Smart Recognition

Re: Smart Recognition

Smart Recognition

Smart Recognition

Re: Commit only some changes

Re: Commit only some changes

Commit only some changes

Re: meld stopped working when run as root

Re: meld stopped working when run as root

Re: meld stopped working when run as root

Re: Ignoring blank lines (again)

Re: Unable to use file filter to filter directories

Re: Ignoring blank lines (again)

Re: Cursor tracking and consequences

Cursor tracking and consequences

Ignoring blank lines (again)

Re: Unable to use file filter to filter directories

Re: Unable to use file filter to filter directories

Unable to use file filter to filter directories

Re: Patch for meld to handle multiple diffs from command line

Re: Patch for meld to handle multiple diffs from command line

Patch for meld to handle multiple diffs from command line

Re: thanks and tiny feature request

Maybe a suggestion to a new feature?

thanks and tiny feature request

Re: Custom conflict colors