[Mnet-devel] A forwarded darcs patch
Arno Waschk
hamamatsu at gmx.de
Tue Jul 27 14:50:51 BST 2004
The following patch was either unsigned, or signed by a non-allowed
key, or there was a gpg failure.
>From hamamatsu at gmx.de Tue Jul 27 14:50:49 2004
Return-Path: <hamamatsu at gmx.de>
X-Original-To: mnet-patches at mnetproject.org
Delivered-To: mnet at gir.maski.org
Received: from mail.gmx.net (mail.gmx.de [213.165.64.20])
by gir.maski.org (Postfix) with SMTP id 461E2502AC
for <mnet-patches at mnetproject.org>; Tue, 27 Jul 2004 14:50:48 +0100 (BST)
Received: (qmail 10532 invoked by uid 65534); 27 Jul 2004 13:54:50 -0000
Received: from pD9E82E7C.dip.t-dialin.net (EHLO mail.gmx.de) (217.232.46.124)
by mail.gmx.net (mp027) with SMTP; 27 Jul 2004 15:54:50 +0200
X-Authenticated: #4543585
Date: Tue, 27 Jul 2004 15:56:41 +0200
To: mnet-patches at mnetproject.org
Reply-To: arno at arnowaschk.de
Content-Type: text/plain; format=flowed; delsp=yes; charset=iso-8859-15
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Message-ID: <opsbsucrosqyfwo1 at mail.gmx.de>
User-Agent: Opera M2/7.52 (Win32, build 3834)
DarcsURL: http://mnetproject.org/repos/mnet_new_mt
Content-Type: multipart/mixed; boundary="aaack"
--aaack
Tue Jul 27 15:50:29 Westeuropäische Sommerzeit 2004 arno at arnowaschk.de
* CVS reimport
--aaack
Content-Type: text/x-darcs-patch
Content-Description: A darcs patch for your repository!
New patches:
[CVS reimport
arno at arnowaschk.de**20040727135029] {
hunk ./doc/EGTPv1_Architecture.txt 5
-CVS revision: $Id: EGTPv1_Architecture.txt,v 1.2 2004/04/06 11:43:24
zooko Exp $
+CVS revision: $Id: EGTPv1_Architecture.txt,v 1.1.1.1 2004/07/23 19:03:03
arnowa Exp $
hunk ./doc/Mnet_v0.6_Architecture.html 12
- <p>CVS revision: $Id: Mnet_v0.6_Architecture.html,v 1.1 2004/02/05
16:31:42 zooko Exp $</p>
+ <p>CVS revision: $Id: Mnet_v0.6_Architecture.html,v 1.1.1.1 2004/07/23
19:03:05 arnowa Exp $</p>
hunk ./doc/Mnet_v0.7_Architecture.html 12
- <p>CVS revision: $Id: Mnet_v0.7_Architecture.html,v 1.1 2004/02/05
16:31:42 zooko Exp $</p>
+ <p>CVS revision: $Id: Mnet_v0.7_Architecture.html,v 1.1.1.1 2004/07/23
19:03:05 arnowa Exp $</p>
hunk ./doc/coding_standards.html 10
- <p>CVS revision: $Id: coding_standards.html,v 1.40 2004/03/07
17:26:01 zooko Exp $</p>
+ <p>CVS revision: $Id: coding_standards.html,v 1.1.1.1 2004/07/23
19:03:02 arnowa Exp $</p>
hunk ./doc/coding_standards.html 51
-__version__ = "$Revision: 1.40 $"
-# $Source: /cvsroot/mnet/mnet_new/doc/coding_standards.html,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/doc/coding_standards.html,v $
hunk ./doc/ent.html 10
- <p>CVS revision: $Id: ent.html,v 1.13 2003/10/06 18:16:09 zooko Exp
$</p>
+ <p>CVS revision: $Id: ent.html,v 1.1.1.1 2004/07/23 19:03:03 arnowa
Exp $</p>
hunk ./doc/new_filesystem.html 12
- <p>CVS revision: $Id: new_filesystem.html,v 1.45 2004/03/05 17:33:40
zooko Exp $</p>
+ <p>CVS revision: $Id: new_filesystem.html,v 1.1.1.1 2004/07/23
19:03:05 arnowa Exp $</p>
hunk ./doc/record_keeper.html 11
- <p>CVS revision: $Id: record_keeper.html,v 1.4 2003/10/06 13:18:54
zooko Exp $</p>
+ <p>CVS revision: $Id: record_keeper.html,v 1.1.1.1 2004/07/23
19:03:05 arnowa Exp $</p>
hunk ./doc/record_keeper.html 114
- <p>CVS revision: $Id: record_keeper.html,v 1.4 2003/10/06 13:18:54
zooko Exp $</p>
+ <p>CVS revision: $Id: record_keeper.html,v 1.1.1.1 2004/07/23
19:03:05 arnowa Exp $</p>
hunk ./egtp/BandwidthThrottler.py 7
-__revision__ = "$Id: BandwidthThrottler.py,v 1.15 2004/04/29 03:48:54
myers_carpenter Exp $"
+__revision__ = "$Id: BandwidthThrottler.py,v 1.1.1.1 2004/07/23 19:03:05
arnowa Exp $"
hunk ./egtp/CommHints.py 6
-__revision__ = "$Id: CommHints.py,v 1.5 2003/05/04 19:23:09 tschechow Exp
$"
+__revision__ = "$Id: CommHints.py,v 1.1.1.1 2004/07/23 19:03:05 arnowa
Exp $"
hunk ./egtp/CommStrat.py 7
-__version__ = "$Revision: 1.40 $"
-# $Source: /cvsroot/mnet/mnet_new/doc/coding_standards.html,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/CommStrat.py,v $
hunk ./egtp/CommsError.py 6
-__revision__ = "$Id: CommsError.py,v 1.2 2003/04/25 17:31:55 tschechow
Exp $"
+__revision__ = "$Id: CommsError.py,v 1.1.1.1 2004/07/23 19:03:05 arnowa
Exp $"
hunk ./egtp/Conversation.py 7
-__revision__ = "$Id: Conversation.py,v 1.12 2003/12/05 16:52:40 zooko Exp
$"
-# $Source: /cvsroot/mnet/mnet_new/egtp/Conversation.py,v $
+__revision__ = "$Id: Conversation.py,v 1.1.1.1 2004/07/23 19:03:06 arnowa
Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/Conversation.py,v $
hunk ./egtp/CryptoCommsHandler.py 6
-__revision__ = "$Id: CryptoCommsHandler.py,v 1.17 2004/04/29 03:48:54
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/CryptoCommsHandler.py,v $
+__revision__ = "$Id: CryptoCommsHandler.py,v 1.2 2004/07/23 20:10:17
arnowa Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/CryptoCommsHandler.py,v $
hunk ./egtp/CryptoCommsHandler.py 277
+ try:
hunk ./egtp/CryptoCommsHandler.py 280
+ except:
+ peer.shareablepeercommstrat = None
hunk ./egtp/DataTypes.py 10
-__revision__ = "$Id: DataTypes.py,v 1.8 2003/12/09 16:24:14 zooko Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/DataTypes.py,v $
+__revision__ = "$Id: DataTypes.py,v 1.1.1.1 2004/07/23 19:03:07 arnowa
Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/DataTypes.py,v $
hunk ./egtp/EGTPConstants.py 7
-__revision__ = "$Id: EGTPConstants.py,v 1.2 2003/04/25 17:31:57 tschechow
Exp $"
+__revision__ = "$Id: EGTPConstants.py,v 1.1.1.1 2004/07/23 19:03:07
arnowa Exp $"
hunk ./egtp/ListenerManager.py 11
-__version__ = "$Revision: 1.9 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/ListenerManager.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/ListenerManager.py,v $
hunk ./egtp/MojoHandicapper.py 7
-__revision__ = "$Id: MojoHandicapper.py,v 1.4 2004/05/04 15:27:36
myers_carpenter Exp $"
+__revision__ = "$Id: MojoHandicapper.py,v 1.1.1.1 2004/07/23 19:03:09
arnowa Exp $"
hunk ./egtp/MojoMessage.py 6
-__revision__ = "$Id: MojoMessage.py,v 1.7 2003/11/02 20:04:34 zooko Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/MojoMessage.py,v $
+__revision__ = "$Id: MojoMessage.py,v 1.1.1.1 2004/07/23 19:03:09 arnowa
Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/MojoMessage.py,v $
hunk ./egtp/MojoTransaction.py 7
-__revision__ = "$Id: MojoTransaction.py,v 1.42 2004/05/04 15:27:36
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/MojoTransaction.py,v $
+__revision__ = "$Id: MojoTransaction.py,v 1.2 2004/07/23 20:10:17 arnowa
Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/MojoTransaction.py,v $
hunk ./egtp/MojoTransaction.py 571
+ try:
hunk ./egtp/MojoTransaction.py 574
+ except:
+ peer.shareablepeercommstrat = None
hunk ./egtp/MojoTransaction.py 968
+ try:
hunk ./egtp/MojoTransaction.py 971
+ except:
+ peer.shareablepeercommstrat = None
hunk ./egtp/Node.py 9
-__version__ = "$Revision: 1.34 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/Node.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/Node.py,v $
hunk ./egtp/OurMessagesCommStrat.py 6
-__revision__ = "$Id: OurMessagesCommStrat.py,v 1.3 2003/12/09 16:24:14
zooko Exp $"
+__revision__ = "$Id: OurMessagesCommStrat.py,v 1.1.1.1 2004/07/23
19:03:10 arnowa Exp $"
hunk ./egtp/OurMessagesPublicKey.py 6
-__revision__ = "$Id: OurMessagesPublicKey.py,v 1.2 2003/04/25 17:31:59
tschechow Exp $"
+__revision__ = "$Id: OurMessagesPublicKey.py,v 1.1.1.1 2004/07/23
19:03:10 arnowa Exp $"
hunk ./egtp/RelayListener.py 8
-__revision__ = "$Id: RelayListener.py,v 1.16 2004/05/04 15:27:36
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/RelayListener.py,v $
+__revision__ = "$Id: RelayListener.py,v 1.1.1.1 2004/07/23 19:03:11
arnowa Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/RelayListener.py,v $
hunk ./egtp/TCPCommsHandler.py 6
-__revision__ = "$Id: TCPCommsHandler.py,v 1.18 2004/04/29 03:48:56
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/TCPCommsHandler.py,v $
+__revision__ = "$Id: TCPCommsHandler.py,v 1.2 2004/07/23 20:10:17 arnowa
Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/TCPCommsHandler.py,v $
hunk ./egtp/TCPCommsHandler.py 377
+ try:
hunk ./egtp/TCPCommsHandler.py 380
+ except:
+ peer.shareablepeercommstrat = None
hunk ./egtp/TCPConnection.py 10
-__revision__ = "$Id: TCPConnection.py,v 1.14 2004/05/04 15:27:36
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/TCPConnection.py,v $
+__revision__ = "$Id: TCPConnection.py,v 1.1.1.1 2004/07/23 19:03:12
arnowa Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/TCPConnection.py,v $
hunk ./egtp/UnreliableHandicapper.py 6
-__revision__ = "$Id: UnreliableHandicapper.py,v 1.4 2004/05/04 15:27:36
myers_carpenter Exp $"
+__revision__ = "$Id: UnreliableHandicapper.py,v 1.1.1.1 2004/07/23
19:03:12 arnowa Exp $"
hunk ./egtp/__init__.py 60
-__versionnano__ = 60
+__versionnano__ = 61
hunk ./egtp/__init__.py 68
-__versionsources__ = ["http://mnetproject.org/repos/mnet_new_mt",]
+__versionsources__ = ["http://mnetproject.org/repos/mnet_new_mt", "cvs
-d:pserver:anonymous at cvs.sf.net:/cvsroot/mnet co darcs-mnet_new_mt",]
hunk ./egtp/bootpage.py 20
-__version__ = "$Revision: 1.40 $"
-# $Source: /cvsroot/mnet/mnet_new/doc/coding_standards.html,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/bootpage.py,v $
hunk ./egtp/canon.py 6
-__revision__ = "$Id: canon.py,v 1.5 2003/05/04 19:23:09 tschechow Exp $"
+__revision__ = "$Id: canon.py,v 1.1.1.1 2004/07/23 19:03:05 arnowa Exp $"
hunk ./egtp/counterparties.py 7
-__revision__ = "$Id: counterparties.py,v 1.18 2004/05/04 16:02:57
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/counterparties.py,v $
+__revision__ = "$Id: counterparties.py,v 1.1.1.1 2004/07/23 19:03:06
arnowa Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/counterparties.py,v $
hunk ./egtp/hashrandom.py 6
-__revision__ = "$Id: hashrandom.py,v 1.2 2003/04/25 17:31:59 tschechow
Exp $"
+__revision__ = "$Id: hashrandom.py,v 1.1.1.1 2004/07/23 19:03:07 arnowa
Exp $"
hunk ./egtp/idlib.py 15
-__revision__ = "$Id: idlib.py,v 1.7 2003/12/07 10:56:45 zooko Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/idlib.py,v $
+__revision__ = "$Id: idlib.py,v 1.1.1.1 2004/07/23 19:03:07 arnowa Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/idlib.py,v $
hunk ./egtp/interfaces.py 13
-__revision__ = "$Id: interfaces.py,v 1.9 2004/05/04 15:27:36
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/interfaces.py,v $
+__revision__ = "$Id: interfaces.py,v 1.1.1.1 2004/07/23 19:03:07 arnowa
Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/interfaces.py,v $
hunk ./egtp/ipaddresslib.py 6
-__revision__ = "$Id: ipaddresslib.py,v 1.6 2004/04/29 03:48:56
myers_carpenter Exp $"
+__revision__ = "$Id: ipaddresslib.py,v 1.1.1.1 2004/07/23 19:03:07 arnowa
Exp $"
hunk ./egtp/keyutil.py 6
-__revision__ = "$Id: keyutil.py,v 1.6 2003/10/19 23:19:23 zooko Exp $"
+__revision__ = "$Id: keyutil.py,v 1.1.1.1 2004/07/23 19:03:08 arnowa Exp
$"
hunk ./egtp/loggedthreading.py 6
-__revision__ = "$Id: loggedthreading.py,v 1.4 2003/10/19 16:57:34 zooko
Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/loggedthreading.py,v $
+__revision__ = "$Id: loggedthreading.py,v 1.1.1.1 2004/07/23 19:03:08
arnowa Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/loggedthreading.py,v $
hunk ./egtp/mencode/__init__.py 6
-__revision__ = "$Id: __init__.py,v 1.1.1.1 2003/03/29 18:28:43
myers_carpenter Exp $"
+__revision__ = "$Id: __init__.py,v 1.1.1.1 2004/07/23 19:03:12 arnowa Exp
$"
hunk ./egtp/mencode/_c_mencode_help.c 4
- * $Id: _c_mencode_help.c,v 1.4 2003/10/19 16:57:34 zooko Exp $
+ * $Id: _c_mencode_help.c,v 1.1.1.1 2004/07/23 19:03:12 arnowa Exp $
hunk ./egtp/mencode/mencode.py 7
-__version__ = "$Revision: 1.10 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/mencode/mencode.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/mencode/mencode.py,v $
hunk ./egtp/mesgen.py 7
-__version__ = "$Revision: 1.24 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/mesgen.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/mesgen.py,v $
hunk ./egtp/metatracker/MetaTracker.py 81
- peer.consider_commstrat(csobj)
+ peer.accept_commstrat(csobj) #Sigh. We put that in after
months of hacking, and now it needs to be reintroduced --arnowa
+ #peer.consider_commstrat(csobj)
hunk ./egtp/mojosixbit.py 6
-__revision__ = "$Id: mojosixbit.py,v 1.3 2003/04/25 18:57:04 tschechow
Exp $"
+__revision__ = "$Id: mojosixbit.py,v 1.1.1.1 2004/07/23 19:03:09 arnowa
Exp $"
hunk ./egtp/mojoutil.py 10
-__revision__ = "$Id: mojoutil.py,v 1.8 2004/05/04 15:27:36
myers_carpenter Exp $"
+__revision__ = "$Id: mojoutil.py,v 1.1.1.1 2004/07/23 19:03:10 arnowa Exp
$"
hunk ./egtp/peerman.py 7
-__version__ = "$Revision: 1.4 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/peerman.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/peerman.py,v $
hunk ./egtp/peerset.py 19
-__version__ = "$Revision: 1.4 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/peerset.py,v $
+__version__ = "$Revision: 1.2 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/peerset.py,v $
hunk ./egtp/peerset.py 125
+ def accept_commstrat(self, commstrat):
+ """
+ Replace current commstrat with this commstrat.
+ This should be used for incoming hello meassages since we should
believe them.
+ @param commstrat: a commstrat that can be used to communicate
with this peer
+ """
+ self.peercommstrat = commstrat
+ try:
+ self.entnode.mtm._ch.use_comm_strategy(self.peercommstrat.id,
self.peercommstrat)
+ if commstrat.is_shareable():
+ self.shareablepeercommstrat = commstrat
+ d = self.to_dict()
+ if d:
+ self.premencodedphonebookentry =
mencode.PreEncodedThing(d)
+ except:
+ pass #What esle can we do here? --arnowa
+
+
hunk ./egtp/peerset.py 158
+ try:
hunk ./egtp/peerset.py 161
+ except:
+ self.shareablepeercommstrat = None
hunk ./egtp/peerset.py 213
+ debugprint("New Peer: %s\n", args=(peerId,))
hunk ./egtp/relayserver/RelayServer.py 12
-__revision__ = "$Id: RelayServer.py,v 1.1 2004/05/04 15:27:37
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/relayserver/RelayServer.py,v $
+__revision__ = "$Id: RelayServer.py,v 1.1.1.1 2004/07/23 19:03:12 arnowa
Exp $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/egtp/relayserver/RelayServer.py,v $
hunk ./egtp/std.py 6
-__revision__ = "$Id: std.py,v 1.2 2003/04/25 17:32:01 tschechow Exp $"
+__revision__ = "$Id: std.py,v 1.1.1.1 2004/07/23 19:03:11 arnowa Exp $"
hunk ./egtp/templs.py 8
-__revision__ = "$Id: templs.py,v 1.3 2004/05/04 15:27:36 myers_carpenter
Exp $"
+__revision__ = "$Id: templs.py,v 1.1.1.1 2004/07/23 19:03:12 arnowa Exp $"
hunk ./egtp/test/__init__.py 6
-__revision__ = "$Id: __init__.py,v 1.1.1.1 2003/03/29 18:28:43
myers_carpenter Exp $"
+__revision__ = "$Id: __init__.py,v 1.1.1.1 2004/07/23 19:03:13 arnowa Exp
$"
hunk ./egtp/test/test_bootpage.py 6
-__version__ = "$Revision: 1.1 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/test/test_bootpage.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/test/test_bootpage.py,v $
hunk ./egtp/test/test_canon.py 7
-__revision__ = "$Id: test_canon.py,v 1.2 2004/04/29 03:48:56
myers_carpenter Exp $"
+__revision__ = "$Id: test_canon.py,v 1.1.1.1 2004/07/23 19:03:12 arnowa
Exp $"
hunk ./egtp/test/test_datatypes.py 4
-__revision__ = "$Id: test_datatypes.py,v 1.2 2004/04/29 03:48:57
myers_carpenter Exp $"
+__revision__ = "$Id: test_datatypes.py,v 1.1.1.1 2004/07/23 19:03:12
arnowa Exp $"
hunk ./egtp/test/test_hashrandom.py 4
-__revision__ = "$Id: test_hashrandom.py,v 1.3 2004/04/29 03:48:57
myers_carpenter Exp $"
+__revision__ = "$Id: test_hashrandom.py,v 1.1.1.1 2004/07/23 19:03:13
arnowa Exp $"
hunk ./egtp/test/test_idlib.py 4
-__revision__ = "$Id: test_idlib.py,v 1.2 2004/04/29 03:48:57
myers_carpenter Exp $"
+__revision__ = "$Id: test_idlib.py,v 1.1.1.1 2004/07/23 19:03:13 arnowa
Exp $"
hunk ./egtp/test/test_keyutils.py 4
-__revision__ = "$Id: test_keyutils.py,v 1.3 2004/04/29 03:48:57
myers_carpenter Exp $"
+__revision__ = "$Id: test_keyutils.py,v 1.1.1.1 2004/07/23 19:03:13
arnowa Exp $"
hunk ./egtp/test/test_loggedthreading.py 4
-__revision__ = "$Id: test_loggedthreading.py,v 1.3 2004/04/29 03:48:57
myers_carpenter Exp $"
+__revision__ = "$Id: test_loggedthreading.py,v 1.1.1.1 2004/07/23
19:03:13 arnowa Exp $"
hunk ./egtp/test/test_mencode.py 9
-__version__ = "$Revision: 1.5 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/test/test_mencode.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/test/test_mencode.py,v $
hunk ./egtp/test/test_mesgen.py 4
-__revision__ = "$Id: test_mesgen.py,v 1.7 2004/04/29 03:48:57
myers_carpenter Exp $"
+__revision__ = "$Id: test_mesgen.py,v 1.1.1.1 2004/07/23 19:03:13 arnowa
Exp $"
hunk ./egtp/test/test_mojosixbit.py 4
-__revision__ = "$Id: test_mojosixbit.py,v 1.2 2004/04/29 03:48:57
myers_carpenter Exp $"
+__revision__ = "$Id: test_mojosixbit.py,v 1.1.1.1 2004/07/23 19:03:13
arnowa Exp $"
hunk ./egtp/test/test_mojoutil.py 4
-__revision__ = "$Id: test_mojoutil.py,v 1.5 2004/04/29 03:48:57
myers_carpenter Exp $"
+__revision__ = "$Id: test_mojoutil.py,v 1.1.1.1 2004/07/23 19:03:13
arnowa Exp $"
hunk ./egtp/test/test_tcpconnection.py 3
-__version__ = "$Revision: 1.3 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/test/test_tcpconnection.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/egtp/test/test_tcpconnection.py,v $
hunk ./egtp/unrepr.py 19
-__version__ = "$Revision: 1.3 $"
-# $Source: /cvsroot/mnet/mnet/common/unrepr.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/unrepr.py,v $
hunk ./egtp/xormetric.py 14
-__version__ = "$Revision: 1.4 $"
-# $Source: /cvsroot/mnet/mnet_new/egtp/xormetric.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/egtp/xormetric.py,v $
hunk ./evilcrypto/__init__.py 15
-__revision__ = "$Id: __init__.py,v 1.1.1.1 2003/03/29 18:36:06
myers_carpenter Exp $"
+__revision__ = "$Id: __init__.py,v 1.1.1.1 2004/07/23 19:03:14 arnowa Exp
$"
hunk ./evilcrypto/aesctr.py 5
-__revision__ = "$Id: aesctr.py,v 1.3 2003/03/29 20:17:09 myers_carpenter
Exp $"
+__revision__ = "$Id: aesctr.py,v 1.1.1.1 2004/07/23 19:03:13 arnowa Exp $"
hunk ./evilcrypto/cryptutil.py 6
-__revision__ = "$Id: cryptutil.py,v 1.3 2003/04/25 17:32:04 tschechow Exp
$"
+__revision__ = "$Id: cryptutil.py,v 1.1.1.1 2004/07/23 19:03:14 arnowa
Exp $"
hunk ./evilcrypto/evilcryptopp.cpp 5
-// $Id: evilcryptopp.cpp,v 1.2 2003/10/17 12:38:44 zooko Exp $
+// $Id: evilcryptopp.cpp,v 1.1.1.1 2004/07/23 19:03:14 arnowa Exp $
hunk ./evilcrypto/modval.py 6
-__revision__ = "$Id: modval.py,v 1.3 2003/04/25 17:32:04 tschechow Exp $"
+__revision__ = "$Id: modval.py,v 1.1.1.1 2004/07/23 19:03:14 arnowa Exp $"
hunk ./evilcrypto/randsource.py 6
-__revision__ = "$Id: randsource.py,v 1.3 2003/04/25 17:32:06 tschechow
Exp $"
+__revision__ = "$Id: randsource.py,v 1.1.1.1 2004/07/23 19:03:14 arnowa
Exp $"
hunk ./evilcrypto/test/test_crypto.py 4
-__version__ = "$Revision: 1.3 $"
-# $Source: /cvsroot/mnet/mnet_new/evilcrypto/test/test_crypto.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/evilcrypto/test/test_crypto.py,v $
hunk ./evilcrypto/test/test_cryptutil.py 8
-__revision__ = "$Id: test_cryptutil.py,v 1.3 2004/04/29 03:48:57
myers_carpenter Exp $"
+__revision__ = "$Id: test_cryptutil.py,v 1.1.1.1 2004/07/23 19:03:15
arnowa Exp $"
hunk ./evilcrypto/tripledescbc.py 5
-__revision__ = "$Id: tripledescbc.py,v 1.2 2003/03/29 20:17:10
myers_carpenter Exp $"
+__revision__ = "$Id: tripledescbc.py,v 1.1.1.1 2004/07/23 19:03:14 arnowa
Exp $"
hunk ./mnetlib/__init__.py 19
-__versionnano__ = 147
+__versionnano__ = 148
hunk ./mnetlib/__init__.py 27
-__versionsources__ = ["http://mnetproject.org/repos/mnet_new_mt",]
+__versionsources__ = ["http://mnetproject.org/repos/mnet_new_mt", "cvs
-d:pserver:anonymous at cvs.sf.net:/cvsroot/mnet co darcs-mnet_new_mt",]
hunk ./mnetlib/confutils.py 67
-__version__ = "$Revision: 1.40 $"
-# $Source: /cvsroot/mnet/mnet_new/doc/coding_standards.html,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/confutils.py,v $
hunk ./mnetlib/ent.py 14
-__version__ = "$Revision: 1.35 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/ent.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/ent.py,v $
hunk ./mnetlib/filesystem/blockserver.py 10
-__revision__ = "$Id: blockserver.py,v 1.13 2004/05/04 15:27:38
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/filesystem/blockserver.py,v $
+__revision__ = "$Id: blockserver.py,v 1.1.1.1 2004/07/23 19:03:16 arnowa
Exp $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/mnetlib/filesystem/blockserver.py,v $
hunk ./mnetlib/filesystem/blockwrangler.py 12
-__version__ = "$Revision: 1.29 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/filesystem/blockwrangler.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/mnetlib/filesystem/blockwrangler.py,v $
hunk ./mnetlib/filesystem/datablock.py 12
-__version__ = "$Revision: 1.4 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/filesystem/datablock.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/mnetlib/filesystem/datablock.py,v $
hunk ./mnetlib/filesystem/download.py 13
-__version__ = "$Revision: 1.13 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/filesystem/download.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/mnetlib/filesystem/download.py,v $
hunk ./mnetlib/filesystem/kiss.py 12
-__revision__ = '$Id: kiss.py,v 1.10 2004/05/04 15:27:38 myers_carpenter
Exp $'
+__revision__ = '$Id: kiss.py,v 1.1.1.1 2004/07/23 19:03:18 arnowa Exp $'
hunk ./mnetlib/filesystem/localblockstore.py 13
-__version__ = "$Revision: 1.62 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/filesystem/localblockstore.py,v
$
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/mnetlib/filesystem/localblockstore.py,v $
hunk ./mnetlib/filesystem/mmapmodule.c 4
- / $Id: mmapmodule.c,v 1.2 2003/10/01 04:47:30 myers_carpenter Exp $
+ / $Id: mmapmodule.c,v 1.1.1.1 2004/07/23 19:03:19 arnowa Exp $
hunk ./mnetlib/filesystem/publish.py 13
-__revision__ = '$Id: publish.py,v 1.25 2004/05/04 15:27:38
myers_carpenter Exp $'
+__revision__ = '$Id: publish.py,v 1.1.1.1 2004/07/23 19:03:19 arnowa Exp
$'
hunk ./mnetlib/filesystem/pusher.py 12
-__revision__ = '$Id: pusher.py,v 1.25 2004/05/04 15:27:38 myers_carpenter
Exp $'
+__revision__ = '$Id: pusher.py,v 1.1.1.1 2004/07/23 19:03:19 arnowa Exp $'
hunk ./mnetlib/filesystem/storedeep.py 7
-__revision__ = '$Id: storedeep.py,v 1.11 2004/04/29 03:48:58
myers_carpenter Exp $'
+__revision__ = '$Id: storedeep.py,v 1.1.1.1 2004/07/23 19:03:19 arnowa
Exp $'
hunk ./mnetlib/filesystem/storedict.py 6
-__revision__ = '$Id: storedict.py,v 1.4 2004/04/23 20:39:12 zooko Exp $'
+__revision__ = '$Id: storedict.py,v 1.1.1.1 2004/07/23 19:03:19 arnowa
Exp $'
hunk ./mnetlib/filesystem/storeflat.py 6
-__revision__ = '$Id: storeflat.py,v 1.13 2004/04/29 03:48:58
myers_carpenter Exp $'
+__revision__ = '$Id: storeflat.py,v 1.1.1.1 2004/07/23 19:03:19 arnowa
Exp $'
hunk ./mnetlib/filesystem/storemntlru.py 7
-__revision__ = '$Id: storemntlru.py,v 1.3 2004/05/04 15:27:38
myers_carpenter Exp $'
+__revision__ = '$Id: storemntlru.py,v 1.1.1.1 2004/07/23 19:03:19 arnowa
Exp $'
hunk ./mnetlib/filesystem/storemntrandom.py 7
-__revision__ = '$Id: storemntrandom.py,v 1.3 2004/05/04 15:27:38
myers_carpenter Exp $'
+__revision__ = '$Id: storemntrandom.py,v 1.1.1.1 2004/07/23 19:03:19
arnowa Exp $'
hunk ./mnetlib/filesystem/znff.py 12
-__version__ = "$Revision: 1.20 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/filesystem/znff.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/filesystem/znff.py,v $
hunk ./mnetlib/mtrouter.py 10
-__revision__ = '$Id: mtrouter.py,v 1.3 2004/05/04 15:27:37
myers_carpenter Exp $'
+__revision__ = '$Id: mtrouter.py,v 1.1.1.1 2004/07/23 19:03:16 arnowa Exp
$'
hunk ./mnetlib/router.py 11
-__version__ = "$Revision: 1.2 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/router.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/router.py,v $
hunk ./mnetlib/scripts/mnetctl.py 22
-__revision__ = "$Id: mnetctl.py,v 1.16 2004/05/04 15:27:39
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/scripts/mnetctl.py,v $
+__revision__ = "$Id: mnetctl.py,v 1.1.1.1 2004/07/23 19:03:20 arnowa Exp
$"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/scripts/mnetctl.py,v $
hunk ./mnetlib/scripts/mnetget.py 10
-__revision__ = '$Id: mnetget.py,v 1.7 2004/05/04 15:27:39 myers_carpenter
Exp $'
+__revision__ = '$Id: mnetget.py,v 1.1.1.1 2004/07/23 19:03:20 arnowa Exp
$'
hunk ./mnetlib/scripts/mnetput.py 10
-__revision__ = '$Id: mnetput.py,v 1.7 2004/05/04 15:27:39 myers_carpenter
Exp $'
+__revision__ = '$Id: mnetput.py,v 1.1.1.1 2004/07/23 19:03:20 arnowa Exp
$'
hunk ./mnetlib/scripts/scriptutil.py 9
-__revision__ = '$Id: scriptutil.py,v 1.2 2003/10/01 04:47:30
myers_carpenter Exp $'
+__revision__ = '$Id: scriptutil.py,v 1.1.1.1 2004/07/23 19:03:20 arnowa
Exp $'
hunk ./mnetlib/scripts/startup.py 7
-__version__ = "$Revision: 1.74 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/scripts/startup.py,v $
+__version__ = "$Revision: 1.2 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/scripts/startup.py,v $
hunk ./mnetlib/scripts/startup.py 77
-bootpage.DEFAULT_BOOTPAGE_URLS =
['http://poro.maski.org:4242/bootpage/','http://metatracker.zooko.com:11078/bootpage/',]
+bootpage.DEFAULT_BOOTPAGE_URLS =
['http://web.nilpotent.org/bootpage.txt',]
+#bootpage.DEFAULT_BOOTPAGE_URLS =
['http://web.nilpotent.org/bootpage.txt','http://poro.maski.org:4242/bootpage/','http://metatracker.zooko.com:11078/bootpage/',]
hunk ./mnetlib/templates.py 10
-__revision__ = "$Id: templates.py,v 1.20 2004/05/04 15:27:37
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/templates.py,v $
+__revision__ = "$Id: templates.py,v 1.1.1.1 2004/07/23 19:03:16 arnowa
Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/templates.py,v $
hunk ./mnetlib/test/test_blockwrangler.py 7
-__version__ = "$Revision: 1.23 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/test/test_blockwrangler.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/mnetlib/test/test_blockwrangler.py,v $
hunk ./mnetlib/test/test_ent.py 6
-__version__ = "$Revision: 1.10 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/test/test_ent.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/test/test_ent.py,v $
hunk ./mnetlib/test/test_fec.py 3
-__version__ = "$Revision: 1.8 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/test/test_fec.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/test/test_fec.py,v $
hunk ./mnetlib/test/test_localblockstore.py 3
-__version__ = "$Revision: 1.26 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/test/test_localblockstore.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source:
/cvsroot/mnet/darcs-mnet_new_mt/mnetlib/test/test_localblockstore.py,v $
hunk ./mnetlib/test/test_pusher.py 7
-__revision__ = "$Id: test_pusher.py,v 1.8 2004/05/04 15:27:39
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/test/test_pusher.py,v $
+__revision__ = "$Id: test_pusher.py,v 1.1.1.1 2004/07/23 19:03:21 arnowa
Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/test/test_pusher.py,v $
hunk ./mnetlib/test/test_znff.py 5
-__version__ = "$Revision: 1.8 $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/test/test_znff.py,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/test/test_znff.py,v $
hunk ./mnetlib/test/unittestutil.py 8
-__revision__ = "$Id: unittestutil.py,v 1.25 2004/05/04 15:27:39
myers_carpenter Exp $"
-# $Source: /cvsroot/mnet/mnet_new/mnetlib/test/unittestutil.py,v $
+__revision__ = "$Id: unittestutil.py,v 1.1.1.1 2004/07/23 19:03:21 arnowa
Exp $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/test/unittestutil.py,v
$
hunk ./mnetlib/underboss.py 17
-__revision__ = '$Id: underboss.py,v 1.10 2003/10/01 04:47:30
myers_carpenter Exp $'
+__revision__ = '$Id: underboss.py,v 1.1.1.1 2004/07/23 19:03:16 arnowa
Exp $'
hunk ./mnetlib/webui/cp2pc.py 11
-__version__ = "$Revision: 1.40 $"
-# $Source: /cvsroot/mnet/mnet_new/doc/coding_standards.html,v $
+__version__ = "$Revision: 1.1.1.1 $"
+# $Source: /cvsroot/mnet/darcs-mnet_new_mt/mnetlib/webui/cp2pc.py,v $
}
Context:
[desperate attempt to fix bug before moving out of this house
zooko at zooko.com**20040520101955]
[finally fixed the bug; nano vernum bump -> 146
zooko at zooko.com**20040519231452]
[even more assertions to track down this stupid bug
zooko at zooko.com**20040519170424]
[vernum bump Mnet v0.7.0-144-v0.7METATRACKER -> Mnet
v0.7.0-145-METATRACKERFORv06NET
zooko at zooko.com**20040519141955]
[add even more peerset._assert_consistency()
zooko at zooko.com**20040519141944]
[handle exception for bootpage parse
zooko at zooko.com**20040519132301]
[nanovernumbump -> Mnet v0.7.0-144-v0.7METATRACKER
zooko at zooko.com**20040518163937]
[a whole bunch more calls to peerset._assert_consistency()
zooko at zooko.com**20040518163321]
[vernum bump -> Mnet v0.7.0-143-v0.7METATRACKER
zooko at zooko.com**20040518151212]
[simpler license
zooko at zooko.com**20040518151100]
[PeerSet._assert_consistency()
zooko at zooko.com**20040518151017
This is designed to flush out a bug wherein a Peer instance gets its
.shareablecommstrat member's ._lowerstrategy member set to None.
]
[printout metatracker contact info on startup
zooko at zooko.com**20040518150954]
[add assertion
zooko at zooko.com**20040515151101]
[tweak coding standards
zooko at zooko.com**20040515150158]
[TAG Mnet v0.7.0a1-142-UNSTABLE
zooko at zooko.com**20040514164533]
Patch bundle hash:
0c421797e72e038153eb8da9fd71d172635ee927
--aaack
More information about the Mnet-devel
mailing list