Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/handler/Editor.java @ 443:bd086be276d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix
author one
date Mon, 13 Sep 2010 00:49:34 +0900
parents 3819dec4641e
children 97593c486db6
comparison
equal deleted inserted replaced
442:3819dec4641e 443:bd086be276d2
391 return false; 391 return false;
392 } 392 }
393 return true; 393 return true;
394 } 394 }
395 395
396 396 /**
397 * send command to the editor
398 * called from another Editor instance such as next.send(command)
399 */
397 @Override 400 @Override
398 public void send(REPCommand command) { 401 public void send(REPCommand command) {
399 if (command.eid == REP.MERGE_EID.id || 402 if (command.eid == REP.MERGE_EID.id ||
400 command.cmd==REP.SMCMD_END_MERGE || 403 command.cmd==REP.SMCMD_END_MERGE ||
401 !waitingRequired(command)) { 404 !waitingRequired(command)) {
461 waitingCommandInMerge = w; 464 waitingCommandInMerge = w;
462 return; 465 return;
463 } 466 }
464 PacketSet p = w.remove(0); 467 PacketSet p = w.remove(0);
465 try { 468 try {
466 manage(p.command); 469 send(p.command);
470 // manage(p.command);
467 } catch (Exception e1) { 471 } catch (Exception e1) {
468 assert false; 472 assert false;
469 manager.close(p.channel); 473 manager.close(p.channel);
470 return; 474 return;
471 } 475 }