Check-in [4f095cdba0]
Not logged in

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

Overview
Comment:Replaced part of [3946ff81] which was inadvertently removed via [612f6cee] (parallel edits). Removed an unused var.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 4f095cdba0ad28d8fbf632c6715bea03b404e1e49ce5cff8aa45fe4b20877389
User & Date: stephan 2021-06-30 22:58:26.577
Context
2021-07-01
03:26
Minor doc typo fix. check-in: 12b5eed944 user: stephan tags: trunk
2021-06-30
22:58
Replaced part of [3946ff81] which was inadvertently removed via [612f6cee] (parallel edits). Removed an unused var. check-in: 4f095cdba0 user: stephan tags: trunk
22:49
Mirror many "fossil ui" options to the remote side when using a remote repository. check-in: 612f6cee38 user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/main.c.
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
  verify_all_options();

  if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
  if( isUiCmd && 3==g.argc && file_isdir(g.argv[2], ExtFILE)>0 ){
    /* If REPOSITORY arg is the root of a checkout,
    ** chdir to that checkout so that the current version
    ** gets highlighted in the timeline by default. */
    const char * zArg = g.argv[2];
    char * zCkoutDb = mprintf("%//.fslckout", zArg);
    if(file_size(zCkoutDb, ExtFILE)<=0){
      fossil_free(zCkoutDb);
      zCkoutDb = mprintf("%//_FOSSIL_", zArg);
      if(file_size(zCkoutDb, ExtFILE)<=0){
        fossil_free(zCkoutDb);
        zCkoutDb = 0;
      }
    }
    if(zCkoutDb!=0){
      fossil_free(zCkoutDb);
      if(0!=file_chdir(zArg, 0)){
        fossil_fatal("Cannot chdir to %s", zArg);
      }
      findServerArg = 99;
      fCreate = 0;
      g.argv[2] = 0;
      --g.argc;
    }
  }







|
<
<
<
<
<
<
|
<
<
<
<
|
|







2962
2963
2964
2965
2966
2967
2968
2969






2970




2971
2972
2973
2974
2975
2976
2977
2978
2979
  verify_all_options();

  if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
  if( isUiCmd && 3==g.argc && file_isdir(g.argv[2], ExtFILE)>0 ){
    /* If REPOSITORY arg is the root of a checkout,
    ** chdir to that checkout so that the current version
    ** gets highlighted in the timeline by default. */
    const char * zDir = g.argv[2];






    if(dir_has_ckout_db(zDir)){




      if(0!=file_chdir(zDir, 0)){
        fossil_fatal("Cannot chdir to %s", zDir);
      }
      findServerArg = 99;
      fCreate = 0;
      g.argv[2] = 0;
      --g.argc;
    }
  }
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
    fossil_free(zBrowserArg);
  }
  if( zRemote ){
    /* If a USER@HOST:REPO argument is supplied, then use SSH to run
    ** "fossil ui --nobrowser" on the remote system and to set up a
    ** tunnel from the local machine to the remote. */
    FILE *sshIn;
    const char *zSkin;
    Blob ssh;
    char zLine[1000];
    blob_init(&ssh, 0, 0);
    transport_ssh_command(&ssh);
    blob_appendf(&ssh, 
       " -t -L127.0.0.1:%d:127.0.0.1:%d -- %!$"
       " fossil ui --nobrowser --localauth --port %d",







<







3041
3042
3043
3044
3045
3046
3047

3048
3049
3050
3051
3052
3053
3054
    fossil_free(zBrowserArg);
  }
  if( zRemote ){
    /* If a USER@HOST:REPO argument is supplied, then use SSH to run
    ** "fossil ui --nobrowser" on the remote system and to set up a
    ** tunnel from the local machine to the remote. */
    FILE *sshIn;

    Blob ssh;
    char zLine[1000];
    blob_init(&ssh, 0, 0);
    transport_ssh_command(&ssh);
    blob_appendf(&ssh, 
       " -t -L127.0.0.1:%d:127.0.0.1:%d -- %!$"
       " fossil ui --nobrowser --localauth --port %d",