Fossil

Differences From Artifact [79eea7d1a7]:

• File src/clone.c — part of check-in [5fdad9bd8c] at 2014-03-31 16:48:57 on branch trunk — Get rid of the GLOBAL_URL() kludge. Change the global "g" variable to contain an instance of the UrlData object instead of individual fields of the UrlData object. (user: drh size: 8388) [more...]

To Artifact [6583b38d72]:

• File src/clone.c — part of check-in [9f2a03bbb8] at 2014-04-14 14:20:33 on branch default-user — Potential resolution of conflict with [64aa75260f] which causes the default-user setting to be ignored. Attempt to set default user from config if defined. (user: andybradford size: 8454)

134
135
136
137
138
139
140

141
142
143
144
145
146
147

  }
  db_open_config(0);
  if( file_size(g.argv[3])>0 ){
    fossil_fatal("file already exists: %s", g.argv[3]);
  }

  url_parse(g.argv[2], urlFlags);

  if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user;
  if( g.url.isFile ){
    file_copy(g.url.name, g.argv[3]);
    db_close(1);
    db_open_repository(g.argv[3]);
    db_record_repository_filename(g.argv[3]);
    url_remember();

>

134
135
136
137
138
139
140
141
142
143
144
145
146
147
148

  }
  db_open_config(0);
  if( file_size(g.argv[3])>0 ){
    fossil_fatal("file already exists: %s", g.argv[3]);
  }

  url_parse(g.argv[2], urlFlags);
  if( zDefaultUser==0 ) zDefaultUser = db_get("default-user", 0);
  if( zDefaultUser==0 && g.url.user!=0 ) zDefaultUser = g.url.user;
  if( g.url.isFile ){
    file_copy(g.url.name, g.argv[3]);
    db_close(1);
    db_open_repository(g.argv[3]);
    db_record_repository_filename(g.argv[3]);
    url_remember();