Mercurial > hg > RemoteEditor > REPSessionManager

changeset 446:6a7004071777

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
It works, sometimes.
author one
date Wed, 22 Sep 2010 15:04:33 +0900
parents 22a741c1fa2d
children dc9b2da06fa9
files rep/handler/Translator.java
diffstat 1 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/rep/handler/Translator.java	Sat Sep 18 00:10:57 2010 +0900
+++ b/rep/handler/Translator.java	Wed Sep 22 15:04:33 2010 +0900
@@ -65,6 +65,7 @@
 		}
 
 		sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1));
+		logger.writeLog("sentList"+eid+":"+editor.getSentList());
 		for( REPCommand cmd0 : editor.getSentList()) {
 			if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE)
 				sortedEditCmds.add(cmd0);
@@ -82,6 +83,17 @@
 	}
 
 	/**
+	 * Received all merge command ack
+	 */
+	public void endMerge() {
+		LinkedList<REPCommand> n = new LinkedList<REPCommand>();
+		for(int i=0;i< sortedEditCmds.size()-1;i++) {
+			n.addLast(unMergedCmds.get(i));
+		}
+		sortedEditCmds = null;
+		unMergedCmds = n;
+	}
+	/**
 	 * Sent optimized merged command list
 	 * @param editor 
 	 * @param output
@@ -213,16 +225,6 @@
 	public void mergeAck() {
 	}
 
-	/**
-	 * Received all merge command ack
-	 */
-	public void endMerge() {
-		unMergedCmds.clear();
-		for( REPCommand cmd0 : sortedEditCmds) {
-			unMergedCmds.add( createUndo(cmd0) );
-		}
-		sortedEditCmds.clear();
-	}