Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/handler/Editor.java @ 448:ed97273477a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix sentList
author one
date Wed, 22 Sep 2010 17:42:47 +0900
parents 22a741c1fa2d
children 89a326696c54
comparison
equal deleted inserted replaced
447:dc9b2da06fa9 448:ed97273477a0
241 return true; 241 return true;
242 } 242 }
243 243
244 private void startMerge(REPCommand command) { 244 private void startMerge(REPCommand command) {
245 preMergeCommand = new REPCommand(command); 245 preMergeCommand = new REPCommand(command);
246 preMergeCommand.string = "";
247 // merge は必須だが、EditorのCommand実装をテストするには邪魔なので、off に出来るようにする。 246 // merge は必須だが、EditorのCommand実装をテストするには邪魔なので、off に出来るようにする。
248 if (noMergeMode) { 247 if (noMergeMode) {
249 checkQuit(); 248 checkQuit();
250 endMerge(); 249 endMerge();
251 return; 250 return;
306 switch(keep.cmd) { 305 switch(keep.cmd) {
307 case REPCMD_INSERT: keep.cmd = REP.REPCMD_INSERT_ACK;break; 306 case REPCMD_INSERT: keep.cmd = REP.REPCMD_INSERT_ACK;break;
308 case REPCMD_DELETE: keep.cmd = REP.REPCMD_DELETE_ACK;break; 307 case REPCMD_DELETE: keep.cmd = REP.REPCMD_DELETE_ACK;break;
309 default: assert(false); 308 default: assert(false);
310 } 309 }
311 sentList.add(keep); 310 sentList.add(preMergeCommand);
312 //ServerMainLoop.logger.writeLog("Editor eid:"+eid+" sentList = "+sentList); 311 //ServerMainLoop.logger.writeLog("Editor eid:"+eid+" sentList = "+sentList);
313 assert(sentList.size()<limit); 312 assert(sentList.size()<limit);
314 next.send(keep); 313 next.send(keep);
315 } else { 314 } else {
316 next.send(preMergeCommand); 315 next.send(preMergeCommand);