Check-in [69fe4237ce]
Not logged in

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

Overview
Comment:Fix the usage comment for incorrect parameters on "fossil config sync". Separately, remove an extra newline from the usage output.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 69fe4237cee86c0593edca3f4bde353d45783e45
User & Date: drh 2013-03-03 00:30:23.249
Context
2013-03-03
15:32
New warning when file is considered binary due to long lines only. check-in: 3a74f9fe52 user: jan.nijtmans tags: trunk
00:30
Fix the usage comment for incorrect parameters on "fossil config sync". Separately, remove an extra newline from the usage output. check-in: 69fe4237ce user: drh tags: trunk
00:26
Do not prompt for passwords on ssh: or file: syncs. check-in: c06e474f68 user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/configure.c.
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900

    if( zMethod[0]!='s' ) legacyFlag = find_option("legacy",0,0)!=0;
    if( strncmp(zMethod,"pull",n)==0 ){
      overwriteFlag = find_option("overwrite",0,0)!=0;
    }
    url_proxy_options();
    if( g.argc!=4 && g.argc!=5 ){
      usage("pull AREA ?URL?");
    }
    mask = configure_name_to_mask(g.argv[3], 1);
    if( g.argc==5 ){
      zServer = g.argv[4];
    }
    url_parse(zServer, URL_PROMPT_PW);
    if( g.urlProtocol==0 ) fossil_fatal("no server URL specified");







|







886
887
888
889
890
891
892
893
894
895
896
897
898
899
900

    if( zMethod[0]!='s' ) legacyFlag = find_option("legacy",0,0)!=0;
    if( strncmp(zMethod,"pull",n)==0 ){
      overwriteFlag = find_option("overwrite",0,0)!=0;
    }
    url_proxy_options();
    if( g.argc!=4 && g.argc!=5 ){
      usage(mprintf("%s AREA ?URL?", zMethod));
    }
    mask = configure_name_to_mask(g.argv[3], 1);
    if( g.argc==5 ){
      zServer = g.argv[4];
    }
    url_parse(zServer, URL_PROMPT_PW);
    if( g.urlProtocol==0 ) fossil_fatal("no server URL specified");
Changes to src/main.c.
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
  return 0;
}

/*
** Print a usage comment and quit
*/
void usage(const char *zFormat){
  fossil_fatal("Usage: %s %s %s\n", g.argv[0], g.argv[1], zFormat);
}

/*
** Remove n elements from g.argv beginning with the i-th element.
*/
static void remove_from_argv(int i, int n){
  int j;







|







603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
  return 0;
}

/*
** Print a usage comment and quit
*/
void usage(const char *zFormat){
  fossil_fatal("Usage: %s %s %s", g.argv[0], g.argv[1], zFormat);
}

/*
** Remove n elements from g.argv beginning with the i-th element.
*/
static void remove_from_argv(int i, int n){
  int j;