Compare Plugin - Unable to turn off Synchronize Vertical Scrolling Version 7.6.6 with Compare V2

Jeff Miller

Thanks for the Suggestion.
Use Case for How we have been using the Compare Function.
In the product we support we use the Compare Function to Customize the ERP Package, to a specific Customer’s needs.
The Source Code is Based upon java.
Event Driven Actions called “Stanza’s” which are represented as sections that begin with
[[MODULE.ACTION]]
This comes out of a Rapid Development System which then compiles this into a more concise form that ends up being executed in Java.
What we do not have control of is the specific presence or lack of an action, but within specific subsections we may do a lot of Cutting and Pasting.
The two Attached files are the same Program Source. One in its original un-modified form, and the other in a modified form for a customer.
Areas of Differences within a Stanza may be more than 30 Lines, but it is a case of simply not
using them in one version, but comparing only those parts that are similar to fix things, then doing Cut and Paste to merge things within a Stanza.
This has been easy to do by doing the Compare.
Breaking the Sync.
Aligning on a Stanza Declaration.
Then re-establishing the Vertical Sync at that point.
The Entire File itself is not the object of our Edits, rather the sub-sections within.

I am not sure how to directly Attach Code Samples.
Original Version:

[[OPE_ORDHDR.ADIS]]
rem --- Check for void

if callpoint!.getColumnData("OPE_ORDHDR.INVOICE_TYPE")="V" then
   msg_id$="OP_ORDINV_VOID"
   gosub disp_message
   callpoint!.setStatus("NEWREC")
   break
   rem --- exit from callpoint
endif

rem --- Check for invoice

if callpoint!.getColumnData("OPE_ORDHDR.ORDINV_FLAG")="I" then
   msg_id$="OP_IS_INVOICE"
   gosub disp_message
   callpoint!.setStatus("NEWREC")
   break
   rem --- exit from callpoint
endif

rem --- Check locked status

gosub check_lock_flag

if locked=1 then
   user_tpl.do_end_of_form=0

   callpoint!.setStatus("NEWREC")
   break
   rem --- exit callpoint
endif

rem --- Reprint order?

if callpoint!.getColumnData("OPE_ORDHDR.REPRINT_FLAG")<>"Y" then
   cust_id$=callpoint!.getColumnData("OPE_ORDHDR.CUSTOMER_ID")
   order_no$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO")
   ar_type$=callpoint!.getColumnData("OPE_ORDHDR.AR_TYPE")
   reprint=0
   gosub check_if_reprintable
else
   callpoint!.setDevObject("reprintable",1)
endif

rem --- Show customer data

cust_id$=callpoint!.getColumnData("OPE_ORDHDR.CUSTOMER_ID")
order_no$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO")
gosub display_customer
gosub add_to_batch_print

if callpoint!.getColumnData("OPE_ORDHDR.CASH_SALE")<>"Y" then
   gosub display_aging
   gosub check_credit
endif

gosub disp_cust_comments

rem --- Display Ship to information

ship_to_type$=callpoint!.getColumnData("OPE_ORDHDR.SHIPTO_TYPE")
ship_to_no$=callpoint!.getColumnData("OPE_ORDHDR.SHIPTO_NO")
order_no$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO")
gosub ship_to_info

rem --- Set comm percent (if calling up a B/O, it will have been cleared);rem bug 8001

slsp$=callpoint!.getColumnData("OPE_ORDHDR.SLSPSN_CODE")
gosub get_comm_percent

rem --- Enable buttons

callpoint!.setOptionEnabled("PRNT",1)
callpoint!.setOptionEnabled("RPRT",num(callpoint!.getDevObject("reprintable")))
callpoint!.setOptionEnabled("TTLS",1)
callpoint!.setOptionEnabled("SHPT",1)


rem --- Set all previous values

user_tpl.prev_ext_cost=num(callpoint!.getColumnData("OPE_ORDHDR.TOTAL_COST"))
user_tpl.prev_disc_code$=callpoint!.getColumnData("OPE_ORDHDR.DISC_CODE")
user_tpl.prev_ship_to$=callpoint!.getColumnData("OPE_ORDHDR.SHIPTO_NO")
user_tpl.prev_sales_total=num(callpoint!.getColumnData("OPE_ORDHDR.TOTAL_SALES"))

rem --- Set codes and flags

user_tpl.price_code$=callpoint!.getColumnData("OPE_ORDHDR.PRICE_CODE")
user_tpl.pricing_code$=callpoint!.getColumnData("OPE_ORDHDR.PRICING_CODE")
user_tpl.order_date$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_DATE")
user_tpl.disc_code$=callpoint!.getColumnData("OPE_ORDHDR.DISC_CODE")
user_tpl.new_order=0
user_tpl.record_deleted=0

rem --- Set OrderHelper object fields

ordHelp!=cast(OrderHelper, callpoint!.getDevObject("order_helper_object"))
ordHelp!.setCust_id(callpoint!.getColumnData("OPE_ORDHDR.CUSTOMER_ID"))
ordHelp!.setOrder_no(callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO"))
ordHelp!.setInv_type(callpoint!.getColumnData("OPE_ORDHDR.INVOICE_TYPE"))
ordHelp!.setTaxCode(callpoint!.getColumnData("OPE_ORDHDR.TAX_CODE"))
print "---OrderHelper object fields set"
rem debug

rem --- Clear availability

gosub clear_avail

rem --- Capture current totals so we can tell later if they were changed in the grid

callpoint!.setDevObject("initial_rec_data$",rec_data$)
callpoint!.setDevObject("discount_amt",callpoint!.getColumnData("OPE_ORDHDR.DISCOUNT_AMT"))
callpoint!.setDevObject("freight_amt",callpoint!.getColumnData("OPE_ORDHDR.FREIGHT_AMT"))
callpoint!.setDevObject("tax_amount",callpoint!.getColumnData("OPE_ORDHDR.TAX_AMOUNT"))
callpoint!.setDevObject("taxable_amt",callpoint!.getColumnData("OPE_ORDHDR.TAXABLE_AMT"))
callpoint!.setDevObject("total_cost",callpoint!.getColumnData("OPE_ORDHDR.TOTAL_COST"))
callpoint!.setDevObject("total_sales",callpoint!.getColumnData("OPE_ORDHDR.TOTAL_SALES"))

rem --- Fix bad records with missing ordinv_flag

if cvs(callpoint!.getColumnData("OPE_ORDHDR.ORDINV_FLAG"),2)="" then
   callpoint!.setColumnData("OPE_ORDHDR.ORDINV_FLAG","O")
   callpoint!.setStatus("SAVE")
endif

rem --- Create soCreateWO! instance if needed

op_create_wo$=callpoint!.getDevObject("op_create_wo")
if op_create_wo$="A" then
   rem --- Clean up previous instance as necessary
   if soCreateWO!<>null() then
      soCreateWO!.close()
   endif
   
   customer_id$=callpoint!.getColumnData("OPE_ORDHDR.CUSTOMER_ID")
   order_no$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO")
   soCreateWO!=new SalesOrderCreateWO(firm_id$,customer_id$,order_no$)
   
   rem --- Initialize soCreateWO! only if order NOT on Credit Hold and NOT a Quote
   if callpoint!.getColumnData("OPE_ORDHDR.CREDIT_FLAG")<>"C" and  callpoint!.getColumnData("OPE_ORDHDR.INVOICE_TYPE")<>"P" then
      soCreateWO!.initIsnWOMap(GridVect!.getItem(0))
      if soCreateWO!.woCount() then
         callpoint!.setOptionEnabled("WOLN",1)
      else
         callpoint!.setOptionEnabled("WOLN",0)
      endif
      
      rem --- If order was created via Duplicate Invoice, then create all possible Work Orders.
      if user_tpl.hist_ord$="Y" and callpoint!.getColumnData("OPE_ORDHDR.INVOICE_TYPE")<>"P" then
         soCreateWO!.setCreateWO(Boolean.valueOf("true"))
         user_tpl.hist_ord$=""
      endif
   endif
   
   callpoint!.setDevObject("soCreateWO",soCreateWO!)
   callpoint!.setDevObject("createWOs_status","")
endif

rem --- Disable Ship To fields

ship_to_type$=callpoint!.getColumnData("OPE_ORDHDR.SHIPTO_TYPE")
gosub disable_shipto

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Customized Version
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[[OPE_ORDHDR.ADIS]]
rem --- Check for void

if callpoint!.getColumnData("OPE_ORDHDR.INVOICE_TYPE")="V" then
   msg_id$="OP_ORDINV_VOID"
   gosub disp_message
   callpoint!.setStatus("NEWREC")
   break
   rem --- exit from callpoint
endif

rem --- Check for invoice

if callpoint!.getColumnData("OPE_ORDHDR.ORDINV_FLAG")="I" then
   msg_id$="OP_IS_INVOICE"
   gosub disp_message
   callpoint!.setStatus("NEWREC")
   break
   rem --- exit from callpoint
endif

rem --- Check EDI Flags
if callpoint!.getColumnData("OPE_ORDHDR.EDI_ORIGINATED")="Y" then
   dim msg_tokens$[6]
   msg_id$="OP_EDI_PROGRESS"
   msg_ix=0
   rem "Only Warn Once"
   if  callpoint!.getColumnData("OPE_ORDHDR.EDI_REQPO_MISS")="Y" and callpoint!.getDevObject("op_po_warn")="yes" then
      msg_tokens$[msg_ix]="This Customer Requires a PO but not Specified in this Order"
      msg_ix=msg_ix+1
      callpoint!.setDevObject("op_po_warn","no")
   endif
   if callpoint!.getColumnData("OPE_ORDHDR.EDI_DUPLICATED_P")="Y" then
      msg_tokens$[msg_ix]="This Customer has a Duplicate PO Specified in this Order"
      msg_ix=msg_ix+1
   endif
   if callpoint!.getColumnData("OPE_ORDHDR.EDI_SHIPTO_MIS")="Y" then
      msg_tokens$[msg_ix]="This Customer Requires a Ship  To but not Specified in this Order"
      msg_ix=msg_ix+1
   endif
   if callpoint!.getColumnData("OPE_ORDHDR.EDI_LINE_ERROR")="Y" then
      msg_tokens$[msg_ix]="A Line Item Exception Exists!"
      msg_ix=msg_ix+1
   endif
   if callpoint!.getColumnData("OPE_ORDHDR.EDI_TTL_ERROR")="Y" then
      msg_tokens$[msg_ix]="EDI Total Count doesn't Match Line Items"
      msg_ix=msg_ix+1
   endif
   if msg_ix>0 then
      gosub disp_message
      if pos("PASSVALID"=msg_opt$)<>0 then
         callpoint!.setColumnData("OPE_ORDHDR.EDI_REQPO_MISS","")
         callpoint!.setColumnData("OPE_ORDHDR.EDI_DUPLICATED_P","")
         callpoint!.setColumnData("OPE_ORDHDR.EDI_SHIPTO_MIS","")
         callpoint!.setColumnData("OPE_ORDHDR.EDI_LINE_ERROR","")
         callpoint!.setColumnData("OPE_ORDHDR.EDI_TTL_ERROR","")
         callpoint!.setStatus("MODIFIED")
      endif
   endif
endif

rem --- Check locked status

gosub check_lock_flag

if locked=1 then
   user_tpl.do_end_of_form=0
   callpoint!.clearStatus()
   callpoint!.setStatus("NEWREC")
   break
   rem --- exit callpoint
endif

rem --- Reprint order?

if callpoint!.getColumnData("OPE_ORDHDR.REPRINT_FLAG")<>"Y" then
   cust_id$=callpoint!.getColumnData("OPE_ORDHDR.CUSTOMER_ID")
   order_no$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO")
   ar_type$=callpoint!.getColumnData("OPE_ORDHDR.AR_TYPE")
   reprint=0
   gosub check_if_reprintable
else
   callpoint!.setDevObject("reprintable",1)
endif

rem --- Show customer data

cust_id$=callpoint!.getColumnData("OPE_ORDHDR.CUSTOMER_ID")
order_no$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO")
gosub display_customer
gosub add_to_batch_print

if callpoint!.getColumnData("OPE_ORDHDR.CASH_SALE")<>"Y" then
   gosub display_aging
   gosub check_credit
endif

gosub disp_cust_comments

rem --- Display Ship to information

ship_to_type$=callpoint!.getColumnData("OPE_ORDHDR.SHIPTO_TYPE")
ship_to_no$=callpoint!.getColumnData("OPE_ORDHDR.SHIPTO_NO")
order_no$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO")
gosub ship_to_info

rem --- Set comm percent (if calling up a B/O, it will have been cleared);rem bug 8001 CAH

slsp$=callpoint!.getColumnData("OPE_ORDHDR.SLSPSN_CODE")
gosub get_comm_percent

rem --- Enable buttons

callpoint!.setOptionEnabled("PRNT",1)
callpoint!.setOptionEnabled("RPRT",num(callpoint!.getDevObject("reprintable")))
callpoint!.setOptionEnabled("TTLS",1)
callpoint!.setOptionEnabled("SHPT",1)
callpoint!.setOptionEnabled("BOLP",1)

rem --- Set all previous values

user_tpl.prev_ext_cost=num(callpoint!.getColumnData("OPE_ORDHDR.TOTAL_COST"))
user_tpl.prev_disc_code$=callpoint!.getColumnData("OPE_ORDHDR.DISC_CODE")
user_tpl.prev_ship_to$=callpoint!.getColumnData("OPE_ORDHDR.SHIPTO_NO")
user_tpl.prev_sales_total=num(callpoint!.getColumnData("OPE_ORDHDR.TOTAL_SALES"))

rem --- Set codes and flags

user_tpl.price_code$=callpoint!.getColumnData("OPE_ORDHDR.PRICE_CODE")
user_tpl.pricing_code$=callpoint!.getColumnData("OPE_ORDHDR.PRICING_CODE")
user_tpl.order_date$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_DATE")
user_tpl.disc_code$=callpoint!.getColumnData("OPE_ORDHDR.DISC_CODE")
user_tpl.new_order=0
user_tpl.record_deleted=0

rem --- Set OrderHelper object fields

ordHelp!=cast(OrderHelper, callpoint!.getDevObject("order_helper_object"))
ordHelp!.setCust_id(callpoint!.getColumnData("OPE_ORDHDR.CUSTOMER_ID"))
ordHelp!.setOrder_no(callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO"))
ordHelp!.setInv_type(callpoint!.getColumnData("OPE_ORDHDR.INVOICE_TYPE"))
ordHelp!.setTaxCode(callpoint!.getColumnData("OPE_ORDHDR.TAX_CODE"))
print "---OrderHelper object fields set"
rem debug

rem --- Clear availability

gosub clear_avail

rem --- Capture current totals so we can tell later if they were changed in the grid

callpoint!.setDevObject("initial_rec_data$",rec_data$)
callpoint!.setDevObject("discount_amt",callpoint!.getColumnData("OPE_ORDHDR.DISCOUNT_AMT"))
callpoint!.setDevObject("freight_amt",callpoint!.getColumnData("OPE_ORDHDR.FREIGHT_AMT"))
callpoint!.setDevObject("tax_amount",callpoint!.getColumnData("OPE_ORDHDR.TAX_AMOUNT"))
callpoint!.setDevObject("taxable_amt",callpoint!.getColumnData("OPE_ORDHDR.TAXABLE_AMT"))
callpoint!.setDevObject("total_cost",callpoint!.getColumnData("OPE_ORDHDR.TOTAL_COST"))
callpoint!.setDevObject("total_sales",callpoint!.getColumnData("OPE_ORDHDR.TOTAL_SALES"))

rem --- Fix bad records with missing ordinv_flag

if cvs(callpoint!.getColumnData("OPE_ORDHDR.ORDINV_FLAG"),2)="" then
   callpoint!.setColumnData("OPE_ORDHDR.ORDINV_FLAG","O",1)
   callpoint!.setStatus("SAVE-FLUSHOFF")
endif

rem --- Create soCreateWO! instance if needed

op_create_wo$=callpoint!.getDevObject("op_create_wo")
if op_create_wo$="A" then
   rem --- Clean up previous instance as necessary
   if soCreateWO!<>null() then
      soCreateWO!.close()
   endif
   
   customer_id$=callpoint!.getColumnData("OPE_ORDHDR.CUSTOMER_ID")
   order_no$=callpoint!.getColumnData("OPE_ORDHDR.ORDER_NO")
   soCreateWO!=new SalesOrderCreateWO(firm_id$,customer_id$,order_no$)
   
   rem --- Initialize soCreateWO! only if order NOT on Credit Hold and NOT a Quote
   if callpoint!.getColumnData("OPE_ORDHDR.CREDIT_FLAG")<>"C" and  callpoint!.getColumnData("OPE_ORDHDR.INVOICE_TYPE")<>"P" then
      soCreateWO!.initIsnWOMap(GridVect!.getItem(0))
      if soCreateWO!.woCount() then
         callpoint!.setOptionEnabled("WOLN",1)
      else
         callpoint!.setOptionEnabled("WOLN",0)
      endif
      
      rem --- If order was created via Duplicate Invoice, then create all possible Work Orders.
      if user_tpl.hist_ord$="Y" and callpoint!.getColumnData("OPE_ORDHDR.INVOICE_TYPE")<>"P" then
         soCreateWO!.setCreateWO(Boolean.valueOf("true"))
         user_tpl.hist_ord$=""
      endif
   endif
   
   callpoint!.setDevObject("soCreateWO",soCreateWO!)
   callpoint!.setDevObject("createWOs_status","")
endif

rem --- Disable Ship To fields

ship_to_type$=callpoint!.getColumnData("OPE_ORDHDR.SHIPTO_TYPE")
gosub disable_shipto

rem --- Enable EDI Transcript of Data Present
edi_text$=cvs(callpoint!.getColumnData("OPE_ORDHDR.EDI_TRANS_TEXT"),3)
if edi_text$>"" then
   callpoint!.setOptionEnabled("EDI",1)
else
   callpoint!.setOptionEnabled("EDI",0)
endif
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

The Full Program in the original version is 3,469 Lines and the Modified Version i 5,384 Lines.

I will post a Zip file containing both Sources up on DropBox and send a link to anyone interested.

pnedev

@PeterJones ,

or had you/the-others just not thought of a use case for non-synced diff?

Yes, I didn’t come-up with such use case.
Strictly speaking it is not exactly a “compare” function. Compare finds similarities and differences and aligns them. Manual alignment can be done simply if you put each file in a separate view without comparing them. I agree however that it might be useful addition.

@Jeff-Miller,

I didn’t get your thorough description but I have two questions:

Then re-establishing the Vertical Sync at that point.

Does that sentence mean that you would like to establish vertical sync but manually (at place of your liking) instead of just disabling vertical sync completely?

The Entire File itself is not the object of our Edits, rather the sub-sections within.

Does the last sentence mean that you would like to compare sub-sections of the files instead of disabling the vertical scroll sync? (The current development version of Compare already has such function)

Jeff Miller

Usually I Open Both files. Click on Compare, which automatically turns on all the Syncing.
Scroll Down to the header of a Stanza that I am working on, which typically no longer aligns with the other Screen.
Turn off Vertical Sync. Search to the Same “Header” and manually realign them. Then Turn Vertical Sync back on.
So the answer is the ability to toggle the Sync on and off manually, but the initial Automatic On is fine.
Likewise I sometimes toggle off Horizontal Sync to compare long lines with Word Wrap Toggled Off, but this is usually to
find Fat Finger Typing on my part.

Something I didn’t touch upon, is that the two files being compared may not necessarily have the Stanza’s in the Same Order.
It is amazing at how well the Compare can find these and mark them up accordingly, then the ability to turn off the Vertical Sync.
Manually Align them, and then turn the Vertical Sync back on, works great.

I do have the full version of those two files zipped up, if you would like to evaluate. I wasn’t sure how to attach them here, or an email address to send a Dropbox Share to.

I don’t know how you would implement the sub-section of a file concept with what I am dealing with. My examples show a single
generated Program, but a lot of times there are parallel program constructs. Like an Order Entry versus an Invoice Entry screen both dealing with Line Item Details. The Module Name in my Example of [[MODULE.ACTION]] might be different, but the Action part would be similar, which requires human interaction. This is where KDIFF and Tortois Git start running into problems, because it tries to help, and the simple Merge Left or Right starts to fall apart.

For Example
[[OPE_ORDHDR.ADIS]]
rem — Check for void
if callpoint!.getColumnData(“OPE_ORDHDR.INVOICE_TYPE”)=“V” then
msg_id$=“OP_ORDINV_VOID”
gosub disp_message
callpoint!.setStatus(“NEWREC”)
break
rem — exit from callpoint
endif

Would be getting compared to
[[OPE_INVHDR.ADIS]]
rem — Check for void
if callpoint!.getColumnData(“OPE_INVHDR.INVOICE_TYPE”)=“V” then
msg_id$=“OP_ORDINV_VOID”
gosub disp_message
callpoint!.setStatus(“NEWREC”)
break
rem — exit from callpoint
endif

Which are essentially the same pieces of code in different sections of the Application, but not in the same file.

Many thanks for looking at this issue.

PeterJones

@pnedev said:

Strictly speaking it is not exactly a “compare” function. Compare finds similarities and differences and aligns them.

But no diff algorithm is perfect. There are times when I just insert code between, so a “perfect” diff/compare should show lines matching, then lines inserted, then lines matching again… but often, depending on how complicated the insert was, it will find enough common characters that it shows lines matching, then lines drastically changed and lines deleted, then a whole bunch of lines inserted.

Here’s one that kindof shows the issue:

Original

SomeGroup(param1, param2)
SomeGroup(param3, param3)
SomeGroup(param4, param4)
SomeGroup(param5, param5)
SomeGroup(param6, param6)

SomeGroup(param1b, param2)
SomeGroup(param3b, param3b)
SomeGroup(param4b, param4)
SomeGroup(param5b, param5b)
SomeGroup(param6b, param6)

I will call those two groups of lines A and B. If I now insert a group C between those two, which is similar but not identical to B, and then edit B also, so it looks like:

Inserted and edited B

SomeGroup(param1, param2)
SomeGroup(param3, param3)
SomeGroup(param4, param4)
SomeGroup(param5, param5)
SomeGroup(param6, param6)

SomeGroup(param1b, param2)
SomeGroup(param3, param3b)
SomeGroup(param4b, param4)
SomeGroup(param5, param5b)
SomeGroup(param6, param6)

SomeGroup(param1b, param2)
SomeGroup(param3, param3b)
SomeGroup(param4b, param4)
SomeGroup(param5, param5b)
SomeGroup(param6, param6)

I’d really like it to show the 5 inserted lines of code and blank line (section C), and the changes in the group B… but insteead, it shows inserts/changes interleaved rather than a group of inserts followed by a group of edits.

This is exacerbated by the blocks being longer…

I understand that’s a deficiency in any diff algorithm, and not something you can fix. But I would solve it by

Now assume it’s a page or two in each block, and t

When I run across a situation like that, I break the sync to scroll down on the “longer” side until I see the block that I knew was originally “B”, while still looking at the top of where “C” went; I then start adding blank (or comment) lines to the “left” file, refreshing the comparison frequently, and watch the “C” highlights on the LEFT, and watch the “B” hightlights on the RIGHT – waiting until both the “C” group and “B” group show up as the diff I want, vs the default diff.

It would make more sense with longer blocks, and being able to show you how I have things scrolled… but this is proof of concept.

I did 5sec pauses on the first/wrong compare, and the final/right compare. And if that’s not long enough, here are the two compares alone:

To sum up: at every step along the way, I am comparing… I am just doing edits/scrolls, so I want to watch different segments of the compare, depending on whether I’m on the LEFT or the RIGHT – but I still want to see what portions on the LEFT the diff/compare thinks are changed and what portions on the RIGHT the diff/compare thinks are changed.

Jeff Miller

Actually both the “This is NOT the diff I want to see” and “This is really the diff I want to see” work for me, as long as I can
toggle off the Sync. Manually reposition the beginning of the Comparison point displayed and then turn the sync back on.

More often then not, I am looking for similarities in Logic between two sections for the place to insert several lines of code that had been used for another client. An exact Diff would usually not match because bits and pieces might have different names. It would be sort of like I am looking for the Lines in Green on the Right that Do not appear at all in the Lines on Left in relatively the same logic blocks. Conversely looking for the Lines in Red on the Left that Do Not appear at all in the lines on the Right, that were probably deleted and Superseded.

Then directly editing and Saving.

Usually after doing one of these Edits, that Source File is then passed through a Parser that performs the Syntax Checking and compiles it into closer to its final form. Then additionally running it through Git to further document changes and the features it brings to the table.

Then when there is a System Wide Update of the Original Base Code, run Kdiff3 against the entire before and after directories. Most Cases using the Kdiff3 functions to deal with slight alterations, then resorting to launching the Before and After files to Notepad++ where the human element must come into play.

The other Notepad++ tool I make heavy use of is “Search - Find” and “Search - Find in Files”.
A field may have changed names in a Table and all of the Code has to be Adjusted, or a File/Path name is directly referenced in the Text and has to be relocated to its new File/Path name throughout the subsystem.

The Actual Applications run in Windows/Mac/Linux and are primarily Linux Based, but the GUI Interface from Tortoise Git, KDiff3, and Notepad++ are the Tools primarily used in development.

pnedev

Hello @Jeff-Miller and @Peter-Jones,

Sorry for the late reply guys.

Jeff,

Manually Align them, and then turn the Vertical Sync back on, works great.

Turning vertical sync back on will NOT do re-compare from your new alignment point. So you are visually “comparing” the stanzas yourself, correct?

Peter,

But no diff algorithm is perfect …

I know what you are talking about.
I remember the times when I was using BeyondCompare extensively and there were cases when I used to set manual sync points. Those were triggering re-comparison from the points set forward.

I am much or less close to releasing a new compare plugin based on the current Compare but with lots of additions, extensions and fixes.
Here are the x86 and x64 versions of my development build for you to try.
Please manually delete your current ComparePlugin.ini config file and manually replace your ComparePlugin.dll with the new one.

The new version doesn’t have the possibility to turn off and then back on the vertical sync (it actually does the vertical sync itself without relying on Notepad++ because of the complicated alignment) but it has another function that might be what you are looking for.
It is called Compare Selections and what it does is simply comparing only the selected lines portion of the two files.
So your use case might look like this:

Compare the whole files.
When you find your “stanza” or manual compare point select the lines after it in both files (or only the lines of the stanzas you want compared) and do Compare Selections.

Tell me if it works for you.
Any other feedback is appreciated as well.

BR

andrecool-68

Hello @pnedev
This version of the plugin works without freezes, unlike “ComparePlus”!

andrecool-68

@pnedev
The old version of ComparePlugin 2.0 still runs faster than ComparePlugin 3.0

Meta Chuh

@andrecool-68

This version of the plugin works without freezes, unlike “ComparePlus”!

i can still reproduce the freeze you discovered, when comparing english.xml with russian.xml using the new ComparePlugin.dll from above, same as ComparePlus, but maybe a few seconds faster.

the freeze happens for me, when reaching about the middle of the progress bar, close to the cancel button.
after the freeze, the progress bar jumps right to the end.

does it run fast for you now ?

@pnedev

many thanks.
as i can see this build is called Compare again, and not ComparePlus.

will you make two separately developed projects, or is it just temporary, and everything above 2.0 will be called ComparePlus ?

big thanks, your work is very appreciated. 👍
best regards.

andrecool-68

@Meta-Chuh
Here is a comparison ComparePlugin 2.0 ComparePlugin 3.0 and builds the latest version of ComparePlus
The first version of the ComparePlus plugin generally hung for 2 minutes (this project was not preserved)

Imgur

PeterJones

@pnedev said:

… Compare Selections. Tell me if it works for you.

Oh, that’s just awesome. I will now be taking the effort to do my compares using this plugin via samba shares, rather than living with the outdated diff tools on the linux box, a lot more often than I used to.

Thank you.

andrecool-68

@pnedev
Notepad ++ with the version of the plugin ComparePlugin 3.0 hangs tight!

Notepad++ v7.6.6 (64-bit)
Build time : May 1 2019 - 23:51:03
Path : C:\Users\Uzeer\Desktop\npp.7.6.6\x64\notepad++.exe
Admin mode : ON
Local Conf mode : ON
OS : Windows 7 (64-bit)
Plugins : ComparePlugin.dll DSpellCheck.dll HTMLTag.dll JSMinNPP.dll MarkdownViewerPlusPlus.dll mimeTools.dll NppConverter.dll NppExport.dll NppMarkdownPanel.dll PluginManager.dll VisualStudioLineCopy.dll XMLTools.dll _CustomizeToolbar.dll

==================================================
Файл процесса     : notepad++.exe
Событие           : Не отвечает и была закрыта
Время события     : 08.05.2019 16:13:59
Пользователь      : Uzeer
Путь к процессу   : C:\Users\Uzeer\Desktop\npp.7.6.6\x64\notepad++.exe
==================================================
Version=1
EventType=AppHangB1
EventTime=132017948399693149
ReportType=3
Consent=1
ReportIdentifier=23f06d3c-7193-11e9-b847-902b343f04b6
IntegratorReportIdentifier=23f06d3d-7193-11e9-b847-902b343f04b6
Response.type=4
Sig[0].Name=Имя приложения
Sig[0].Value=notepad++.exe
Sig[1].Name=Версия приложения
Sig[1].Value=7.6.6.0
Sig[2].Name=Отметка времени приложения
Sig[2].Value=5cca06f7
Sig[3].Name=Сигнатура зависания
Sig[3].Value=84b2
Sig[4].Name=Тип зависания
Sig[4].Value=0
DynamicSig[1].Name=Версия ОС
DynamicSig[1].Value=6.1.7601.2.1.0.768.3
DynamicSig[2].Name=Код языка
DynamicSig[2].Value=1049
DynamicSig[22].Name=Доп. сигнатура зависания 1
DynamicSig[22].Value=84b229ed73cc04a1d4d457685b853177
DynamicSig[23].Name=Доп. сигнатура зависания 2
DynamicSig[23].Value=c3d7
DynamicSig[24].Name=Доп. сигнатура зависания 3
DynamicSig[24].Value=c3d77a4a6a5eadb9dbdbd155b5d197fc
DynamicSig[25].Name=Доп. сигнатура зависания 4
DynamicSig[25].Value=84b2
DynamicSig[26].Name=Доп. сигнатура зависания 5
DynamicSig[26].Value=84b229ed73cc04a1d4d457685b853177
DynamicSig[27].Name=Доп. сигнатура зависания 6
DynamicSig[27].Value=c3d7
DynamicSig[28].Name=Доп. сигнатура зависания 7
DynamicSig[28].Value=c3d77a4a6a5eadb9dbdbd155b5d197fc
UI[3]=Notepad++ : a free (GNU) source code editor не отвечает
UI[4]=Windows может поискать решение проблемы в Интернете. При закрытии не отвечающей программы может быть потеряна несохраненная информация.
UI[5]=Выполнить поиск решения и закрыть программу
UI[6]=Выполнить поиск решения и закрыть программу
UI[7]=Закрыть программу
LoadedModule[0]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\notepad++.exe
LoadedModule[1]=C:\Windows\SYSTEM32\ntdll.dll
LoadedModule[2]=C:\Windows\system32\kernel32.dll
LoadedModule[3]=C:\Windows\system32\KERNELBASE.dll
LoadedModule[4]=C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.7601.17514_none_fa396087175ac9ac\COMCTL32.dll
LoadedModule[5]=C:\Windows\system32\msvcrt.dll
LoadedModule[6]=C:\Windows\system32\GDI32.dll
LoadedModule[7]=C:\Windows\system32\USER32.dll
LoadedModule[8]=C:\Windows\system32\LPK.dll
LoadedModule[9]=C:\Windows\system32\USP10.dll
LoadedModule[10]=C:\Windows\system32\SHLWAPI.dll
LoadedModule[11]=C:\Windows\system32\SHELL32.dll
LoadedModule[12]=C:\Windows\system32\dbghelp.dll
LoadedModule[13]=C:\Windows\system32\VERSION.dll
LoadedModule[14]=C:\Windows\system32\CRYPT32.dll
LoadedModule[15]=C:\Windows\system32\MSASN1.dll
LoadedModule[16]=C:\Windows\system32\WINTRUST.dll
LoadedModule[17]=C:\Windows\system32\RPCRT4.dll
LoadedModule[18]=C:\Windows\system32\SensApi.dll
LoadedModule[19]=C:\Windows\system32\COMDLG32.dll
LoadedModule[20]=C:\Windows\system32\ADVAPI32.dll
LoadedModule[21]=C:\Windows\SYSTEM32\sechost.dll
LoadedModule[22]=C:\Windows\system32\ole32.dll
LoadedModule[23]=C:\Windows\system32\IMM32.DLL
LoadedModule[24]=C:\Windows\system32\MSCTF.dll
LoadedModule[25]=C:\Windows\system32\api-ms-win-core-synch-l1-2-0.DLL
LoadedModule[26]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\SciLexer.dll
LoadedModule[27]=C:\Windows\system32\OLEAUT32.dll
LoadedModule[28]=C:\Windows\system32\Msimg32.DLL
LoadedModule[29]=C:\Windows\system32\uxtheme.dll
LoadedModule[30]=C:\Windows\system32\dwmapi.dll
LoadedModule[31]=C:\Windows\system32\CRYPTBASE.dll
LoadedModule[32]=C:\Windows\system32\WindowsCodecs.dll
LoadedModule[33]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\ComparePlugin\ComparePlugin.dll
LoadedModule[34]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\DSpellCheck\DSpellCheck.dll
LoadedModule[35]=C:\Windows\system32\WININET.dll
LoadedModule[36]=C:\Windows\system32\api-ms-win-downlevel-user32-l1-1-0.dll
LoadedModule[37]=C:\Windows\system32\api-ms-win-downlevel-shlwapi-l1-1-0.dll
LoadedModule[38]=C:\Windows\system32\api-ms-win-downlevel-version-l1-1-0.dll
LoadedModule[39]=C:\Windows\system32\api-ms-win-downlevel-normaliz-l1-1-0.dll
LoadedModule[40]=C:\Windows\system32\normaliz.DLL
LoadedModule[41]=C:\Windows\system32\iertutil.dll
LoadedModule[42]=C:\Windows\system32\api-ms-win-downlevel-advapi32-l1-1-0.dll
LoadedModule[43]=C:\Windows\system32\USERENV.dll
LoadedModule[44]=C:\Windows\system32\profapi.dll
LoadedModule[45]=C:\Windows\system32\WS2_32.dll
LoadedModule[46]=C:\Windows\system32\NSI.dll
LoadedModule[47]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\HTMLTag\HTMLTag.dll
LoadedModule[48]=C:\Windows\system32\netapi32.dll
LoadedModule[49]=C:\Windows\system32\netutils.dll
LoadedModule[50]=C:\Windows\system32\srvcli.dll
LoadedModule[51]=C:\Windows\system32\wkscli.dll
LoadedModule[52]=C:\Windows\system32\SHFolder.dll
LoadedModule[53]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\JSMinNPP\JSMinNPP.dll
LoadedModule[54]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\MarkdownViewerPlusPlus\MarkdownViewerPlusPlus.dll
LoadedModule[55]=C:\Windows\SYSTEM32\MSCOREE.DLL
LoadedModule[56]=C:\Windows\Microsoft.NET\Framework64\v4.0.30319\mscoreei.dll
LoadedModule[57]=C:\Windows\Microsoft.NET\Framework64\v4.0.30319\clr.dll
LoadedModule[58]=C:\Windows\system32\MSVCR120_CLR0400.dll
LoadedModule[59]=C:\Windows\assembly\NativeImages_v4.0.30319_64\mscorlib\b308b9c61f65cf2dfd876031ee385ba4\mscorlib.ni.dll
LoadedModule[60]=C:\Windows\system32\api-ms-win-core-xstate-l2-1-0.dll
LoadedModule[61]=C:\Windows\Microsoft.NET\Framework64\v4.0.30319\clrjit.dll
LoadedModule[62]=C:\Windows\Microsoft.NET\Framework64\v4.0.30319\diasymreader.dll
LoadedModule[63]=C:\Windows\assembly\NativeImages_v4.0.30319_64\System\095a3392942c3d4eb888e6a32036acd8\System.ni.dll
LoadedModule[64]=C:\Windows\assembly\NativeImages_v4.0.30319_64\System.Drawing\dcbadb02f6000b436f1cb0fb736df3ee\System.Drawing.ni.dll
LoadedModule[65]=C:\Windows\assembly\NativeImages_v4.0.30319_64\System.Windows.Forms\fb9f08a1fa8e62ae099d80c57ace90d2\System.Windows.Forms.ni.dll
LoadedModule[66]=C:\Windows\assembly\NativeImages_v4.0.30319_64\System.Core\ccc9e0855af638ecf77291cf01c10b59\System.Core.ni.dll
LoadedModule[67]=C:\Windows\Microsoft.NET\Framework64\v4.0.30319\nlssorting.dll
LoadedModule[68]=C:\Windows\assembly\NativeImages_v4.0.30319_64\System.Configuration\7d75083427584fe395779e2da37e26b0\System.Configuration.ni.dll
LoadedModule[69]=C:\Windows\assembly\NativeImages_v4.0.30319_64\System.Xml\8821b72d5d51079acf96e90c4af19a96\System.Xml.ni.dll
LoadedModule[70]=C:\Windows\system32\bcrypt.dll
LoadedModule[71]=C:\Windows\system32\CRYPTSP.dll
LoadedModule[72]=C:\Windows\system32\rsaenh.dll
LoadedModule[73]=C:\Windows\WinSxS\amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_2b24536c71ed437a\gdiplus.dll
LoadedModule[74]=C:\Windows\system32\CLBCatQ.DLL
LoadedModule[75]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\mimeTools\mimeTools.dll
LoadedModule[76]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\NppConverter\NppConverter.dll
LoadedModule[77]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\NppExport\NppExport.dll
LoadedModule[78]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\NppMarkdownPanel\NppMarkdownPanel.dll
LoadedModule[79]=C:\Windows\system32\RpcRtRemote.dll
LoadedModule[80]=C:\Windows\System32\ieframe.dll
LoadedModule[81]=C:\Windows\System32\api-ms-win-downlevel-shell32-l1-1-0.dll
LoadedModule[82]=C:\Windows\system32\SXS.DLL
LoadedModule[83]=C:\Windows\system32\api-ms-win-downlevel-shlwapi-l2-1-0.dll
LoadedModule[84]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\PluginManager\PluginManager.dll
LoadedModule[85]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\VisualStudioLineCopy\VisualStudioLineCopy.dll
LoadedModule[86]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\XMLTools\XMLTools.dll
LoadedModule[87]=C:\Windows\system32\OLEACC.dll
LoadedModule[88]=C:\Windows\system32\WINMM.dll
LoadedModule[89]=C:\Windows\system32\WINSPOOL.DRV
LoadedModule[90]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\XMLTools\libs\libiconv-2.dll
LoadedModule[91]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\XMLTools\libs\zlib1.dll
LoadedModule[92]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\XMLTools\libs\libwinpthread-1.dll
LoadedModule[93]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\XMLTools\libs\libxml2-2.dll
LoadedModule[94]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\XMLTools\libs\libxslt-1.dll
LoadedModule[95]=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\plugins\_CustomizeToolbar\_CustomizeToolbar.dll
LoadedModule[96]=C:\Windows\system32\PROPSYS.dll
FriendlyEventName=Не отвечает и была закрыта
ConsentKey=AppHangXProcB1
AppName=Notepad++ : a free (GNU) source code editor
AppPath=C:\Users\Uzeer\Desktop\npp.7.6.6\x64\notepad++.exe
ReportDescription=Ошибка привела к остановке взаимодействия программы с Windows.

pnedev

Hello all,

Thank you for the feedback, I appreciate it.

@Meta-Chuh ,

will you make two separately developed projects …

No, I just linked here a state of the development before the transition to the new name. It is to ease the manual installation and reduce the possibility for conflicts if one has both ComparePlugin and ComparePlus installed.
Beside that, ComparePlus current development state is not quite stable because of the ongoing changes.

@andrecool-68 ,

This is just a development version but nevertheless it shouldn’t hang.
I’m kind-of confused because you are saying it is faster than ComparePlus (meaning it works) but then you say it hangs.
Does it hang every time you compare the same files?
Could you please try removing the other plugins and keep just the development ComparePlugin (v3 RC) and test again?
I don’t usually test x64 build myself as I don’t have such setup.
Thanks.

Just FYI, the development compare (no matter if v3 RC or ComparePlus) is considerably slower than Compare v2 when comparing files with lots of replacement lines because it tries to “intelligently” find the changed lines (which brings more accuracy on the price of slower compare). As I said, the compare is perceived to be slower only in the case there are lots of replacements and lines that “look” similar.
To get an idea, look at the following compare excerpt screenshots (first Compare v2, followed by ComparePlus):

Compare v2

ComparePlus

As you can see from the images, Styler and Prefix mode sections are with changed order and ComparePlus tries to match the commands IDs as well (not yet perfect but at least better compare results than Compare v2).

I’m still in the process of developing the smart change detection and I will try to make a good compromise between accuracy and compare speed.

BR

pnedev

Seems like image link sharing failed.

How can I do this?
Thanks.

andrecool-68

@pnedev
Removed all plugins except ComparePlugin 3.0, and periodically Notepad ++ hangs.

Imgur

Meta Chuh

@pnedev

i think you can not embed google drive images, as they don’t provide a static image url to e.g. ComparePlus.png.

best regards

Alan Kilborn

@Meta-Chuh said:

google drive

Plus google drive is simply bad because so many corporations block it; you may not get the best answers if the best answerers can’t see it.

Jeff Miller

The Compare 3.0 looks like it will work.

The only issue I think is on the Notepad++ Side.

The Selecting the Sections requires some extra work, unless I am missing something.

So now I open Both Files and “Move/Clone Current Document” -> “Move to Other View”

Then on the Left View Do a Find for the
Beginning of what I want to Compare.
Then do the
“Edit” -> “Begin/End Select” – Start Selection

Then Scroll Down to the End of the Section in Question.
“Edit” -> “Begin/End Select”. – End Selection

Then repeat on the Right View Do a Find for the
Beginning of what I want to Compare.
Then do the
“Edit” -> “Begin/End Select” – Start Selection

Then Scroll Down to the End of the Section in Question.
“Edit” -> “Begin/End Select” – End Selection

Then “Plugins” -> “Compare” -> “Compare Selections”

So once in this mode, it works well.

It is just a case of additional steps that have to be accomplished if the Stanza’s Don’t Layout the Same.

Also someone had a question about recomparing when breaking and re-establishing the Sync.
Essentially the first Compare pass would mark up the Text in the Various Colors. Then when moving the two sides Separately, we did not want it to run a compare again, just keep the Color Markup that was alread processed.

guy038

Hello, @pnedev, and All,

Thank you so much for the future comparePlugin v3.0, with quite a lot of new features ;-)) Still testing it !

I’m intrigued by the new option Highlight Diffs on Character Level ! What does this mean ?

Good luck in your coding process !

Best Regards,

guy038

pnedev

@Meta-Chuh ,

Thanks for helping with embedding the images.

@andrecool-68 ,

Removed all plugins except ComparePlugin 3.0, and periodically Notepad ++ hangs.

But it doesn’t crash like before, right?
I’ll look into it, thanks.

@Jeff-Miller ,

Yes, unfortunately that’s the case with Compare 3. You need to select manually the sections you are focusing on. Disabling and re-enabling vertical scroll sync in Compare 3 is something that might not be that easy.

Rewriting part of my previous post here to make images directly visible:

Just FYI, the development compare (no matter if v3 RC or ComparePlus) is considerably slower than Compare v2 when comparing files with lots of replacement lines because it tries to “intelligently” find the changed lines (which brings more accuracy on the price of slower compare). As I said, the compare is perceived to be slower only in the case there are lots of replacements and lines that “look” similar.
To get an idea, look at the following compare excerpt screenshots (first Compare v2, followed by ComparePlus):

Compare v2

ComparePlus

As you can see from the images, Styler and Prefix mode sections are with changed order and ComparePlus tries to match the commands IDs as well (not yet perfect but at least better compare results than Compare v2).

I’m still in the process of developing the smart change detection and I will try to make a good compromise between accuracy and compare speed.