[Monotone-commits-diffs] org.debian.monotone: 2ee4c3b152ba3bacfeec097d6f9dd08d7cef23ec

[code]

revision:            2ee4c3b152ba3bacfeec097d6f9dd08d7cef23ec
date:                2010-06-05T00:56:19
author:              address@hidden
branch:              org.debian.monotone
changelog:
Backport upstream fix for slow ancestry checking that made monotone
unusable in certain cases.

manifest:
format_version "1"

new_manifest [e0a1324451ffc644407446ac7e4b5c9ab364ac98]

old_revision [d97532b8a7f1f96d5e3a872dcd4f955e7e0e29bc]

add_file "patches/10-slow-branchy-ancestry.diff"
 content [61cfe99d003fbed963e2bb90e9dc3afc9a4a0259]

patch "changelog"
 from [d21019d6fded16e2744bb1c50ff87dafe2dedf76]
   to [1e2fd07f971cbea55a3b5269315647510e8bc776]

patch "patches/series"
 from [b1efb9fc2092dbe58edb68cae5848d1665351429]
   to [b8bc8bc5cf8502b5c8645cd8527c29ae48648107]
============================================================
--- changelog	d21019d6fded16e2744bb1c50ff87dafe2dedf76
+++ changelog	1e2fd07f971cbea55a3b5269315647510e8bc776
@@ -6,8 +6,10 @@ monotone (0.47-2) UNRELEASED; urgency=lo
 
   [ Francis Russell ]
   * Backport upstream fix for fatal error during sync (closes: #574512).
+  * Backport upstream fix for slow ancestry checking that made monotone
+    unusable in certain cases.
 
- -- Francis Russell <address@hidden>  Fri, 04 Jun 2010 23:28:47 +0100
+ -- Francis Russell <address@hidden>  Sat, 05 Jun 2010 01:45:20 +0100
 
 monotone (0.47-1) unstable; urgency=low
 
============================================================
--- /dev/null	
+++ patches/10-slow-branchy-ancestry.diff	61cfe99d003fbed963e2bb90e9dc3afc9a4a0259
@@ -0,0 +1,34 @@
+Upstream changelog:
+  fix ancestry checking to not be exponentially slow on branchy ancestry
+
+Backport from revision 911f3ce2c66ade267eec549dc15bcef420a1686d.
+Index: monotone-0.47/database.cc
+===================================================================
+--- monotone-0.47.orig/database.cc	2010-06-05 01:36:37.636176391 +0100
++++ monotone-0.47/database.cc	2010-06-05 01:36:44.581925485 +0100
+@@ -2623,6 +2623,7 @@
+ 
+   vector<revision_id> todo;
+   todo.push_back(ancestor);
++  set<revision_id> seen;
+   while (!todo.empty())
+     {
+       revision_id anc = todo.back();
+@@ -2634,11 +2635,16 @@
+         {
+           if (*i == child)
+             return true;
++          else if (seen.find(*i) != seen.end())
++            continue;
+           else
+             {
+               get_rev_height(*i, anc_height);
+               if (child_height > anc_height)
+-                todo.push_back(*i);
++                {
++                  seen.insert(*i);
++                  todo.push_back(*i);
++                }
+             }
+         }
+     }
============================================================
--- patches/series	b1efb9fc2092dbe58edb68cae5848d1665351429
+++ patches/series	b8bc8bc5cf8502b5c8645cd8527c29ae48648107
@@ -1,2 +1,3 @@ 00-push-pull-sync-fail.diff
 00-push-pull-sync-fail.diff
+10-slow-branchy-ancestry.diff
 90-stacktrace-on-crash.diff