From b1317e9fa0f343c92577ce729eb5abee0878b59a Mon Sep 17 00:00:00 2001
From: "bugreport%peshkin.net" <>
Date: Thu, 13 May 2004 06:57:31 +0000
Subject: Bug 226411: make DiffStrings handle fields with duplicate values
 patch by jouni r=joel,myk a=justdave

---
 globals.pl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'globals.pl')

diff --git a/globals.pl b/globals.pl
index 055584f7e..7439940c3 100644
--- a/globals.pl
+++ b/globals.pl
@@ -1404,20 +1404,20 @@ sub DiffStrings {
     my @old = split(" ", $oldstr);
     my @new = split(" ", $newstr);
 
-    my (@remove, @add) = ();
-
-    # Find values that were removed
-    foreach my $value (@old) {
-        push (@remove, $value) if !grep($_ eq $value, @new);
-    }
-
-    # Find values that were added
-    foreach my $value (@new) {
-        push (@add, $value) if !grep($_ eq $value, @old);
+    # For each pair of (old, new) entries: 
+    # If they're equal, set them to empty. When done, @old contains entries
+    # that were removed; @new contains ones that got added.
+
+    foreach my $oldv (@old) {
+      foreach my $newv (@new) {
+        next if ($newv eq '');
+        if ($oldv eq $newv) {
+          $newv = $oldv = '';
+        }
+      }
     }
-
-    my $removed = join (", ", @remove);
-    my $added = join (", ", @add);
+    my $removed = join (", ", grep { $_ ne '' } @old);
+    my $added = join (", ", grep { $_ ne '' } @new);
 
     return ($removed, $added);
 }
-- 
cgit v1.2.3-24-g4f1b