Fossil SCM

After a sync, report "Sync finished" in stead of "Pull finished"

jan.nijtmans 2013-05-23 10:13 trunk
Commit 97040d643693f4825ab634a62e7c93603babfb1b
1 file changed +1 -1
+1 -1
--- src/xfer.c
+++ src/xfer.c
@@ -1379,11 +1379,11 @@
13791379
content_enable_dephantomize(0);
13801380
zOpType = "Clone";
13811381
}else if( syncFlags & SYNC_PULL ){
13821382
blob_appendf(&send, "pull %s %s\n", zSCode, zPCode);
13831383
nCardSent++;
1384
- zOpType = "Pull";
1384
+ zOpType = (syncFlags & SYNC_PUSH)?"Sync":"Pull";
13851385
}
13861386
if( syncFlags & SYNC_PUSH ){
13871387
blob_appendf(&send, "push %s %s\n", zSCode, zPCode);
13881388
nCardSent++;
13891389
if( (syncFlags & SYNC_PULL)==0 ) zOpType = "Push";
13901390
--- src/xfer.c
+++ src/xfer.c
@@ -1379,11 +1379,11 @@
1379 content_enable_dephantomize(0);
1380 zOpType = "Clone";
1381 }else if( syncFlags & SYNC_PULL ){
1382 blob_appendf(&send, "pull %s %s\n", zSCode, zPCode);
1383 nCardSent++;
1384 zOpType = "Pull";
1385 }
1386 if( syncFlags & SYNC_PUSH ){
1387 blob_appendf(&send, "push %s %s\n", zSCode, zPCode);
1388 nCardSent++;
1389 if( (syncFlags & SYNC_PULL)==0 ) zOpType = "Push";
1390
--- src/xfer.c
+++ src/xfer.c
@@ -1379,11 +1379,11 @@
1379 content_enable_dephantomize(0);
1380 zOpType = "Clone";
1381 }else if( syncFlags & SYNC_PULL ){
1382 blob_appendf(&send, "pull %s %s\n", zSCode, zPCode);
1383 nCardSent++;
1384 zOpType = (syncFlags & SYNC_PUSH)?"Sync":"Pull";
1385 }
1386 if( syncFlags & SYNC_PUSH ){
1387 blob_appendf(&send, "push %s %s\n", zSCode, zPCode);
1388 nCardSent++;
1389 if( (syncFlags & SYNC_PULL)==0 ) zOpType = "Push";
1390

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button