Fossil

Check-in [87d323d307]
Login

Check-in [87d323d307]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Allow multiple autosync attempts also for the branch and update commands.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | autosync-tries
Files: files | file ages | folders
SHA1: 87d323d30740daf15d2f7162a4141bc98d88c1e1
User & Date: andybradford 2014-05-30 14:54:38.110
Context
2014-06-01
04:17
Incorporate recent features/fixes. ... (Closed-Leaf check-in: 715a36c8ec user: andybradford tags: autosync-tries)
2014-05-30
14:54
Allow multiple autosync attempts also for the branch and update commands. ... (check-in: 87d323d307 user: andybradford tags: autosync-tries)
03:09
Introduce the autosync-tries setting to control how many attempts autosync will try if there is a failure. Defaults to 1 which is the current behavior. Disabling autosync is still managed with the autosync setting. ... (check-in: 7653ab6342 user: andybradford tags: autosync-tries)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/branch.c.
︙︙
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188

  }


  /* Commit */
  db_end_transaction(0);

  /* Do an autosync push, if requested */
  if( !isPrivate ) autosync(SYNC_PUSH);
}

/*
** Prepare a query that will list branches.
**
** If (which<0) then the query pulls only closed branches. If
** (which>0) then the query pulls all (closed and opened)








|








174
175
176
177
178
179
180
181
182
183
184
185
186
187
188

  }


  /* Commit */
  db_end_transaction(0);

  /* Do an autosync push, if requested */
  if( !isPrivate ) autosync_loop(SYNC_PUSH,db_get_int("autosync-tries", 1));
}

/*
** Prepare a query that will list branches.
**
** If (which<0) then the query pulls only closed branches. If
** (which>0) then the query pulls all (closed and opened)
︙︙
Changes to src/update.c.
︙︙
128
129
130
131
132
133
134
135

136
137
138
139
140
141
142

  debugFlag = find_option("debug",0,0)!=0;
  setmtimeFlag = find_option("setmtime",0,0)!=0;
  capture_case_sensitive_option();
  db_must_be_within_tree();
  vid = db_lget_int("checkout", 0);
  user_select();
  if( !dryRunFlag && !internalUpdate ){
    if( autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag) ){

      fossil_fatal("Cannot proceed with update");
    }
  }
  
  /* Create any empty directories now, as well as after the update,
  ** so changes in settings are reflected now */
  if( !dryRunFlag ) ensure_empty_dirs_created();








|
>








128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143

  debugFlag = find_option("debug",0,0)!=0;
  setmtimeFlag = find_option("setmtime",0,0)!=0;
  capture_case_sensitive_option();
  db_must_be_within_tree();
  vid = db_lget_int("checkout", 0);
  user_select();
  if( !dryRunFlag && !internalUpdate ){
    if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag, 
                      db_get_int("autosync-tries", 1)) ){
      fossil_fatal("Cannot proceed with update");
    }
  }
  
  /* Create any empty directories now, as well as after the update,
  ** so changes in settings are reflected now */
  if( !dryRunFlag ) ensure_empty_dirs_created();
︙︙