CVSTrac Legacy Code

Check-in [6de5916d35]
Login

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

Overview
Comment:We need to use the "full" commit id for the base too.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:6de5916d3580efcc2c94ce58deaa514d2b4328bd
User & Date: root 2015-06-17 13:04:23
Context
2016-07-18
19:22
block PROXY param. See https://httpoxy.org/ check-in: 5124b0f577 user: cpb tags: trunk
2015-06-17
13:04
We need to use the "full" commit id for the base too. check-in: 6de5916d35 user: root tags: trunk
2015-06-04
18:55
Need to prefix filenames with the module for browse to work correctly. Fortunately, we can strip it. check-in: 0b1a22dfae user: cpb tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to git.c.

403
404
405
406
407
408
409




410
411
412
413
414

415
416
417
418
419
420
421
    char zCommit[PATH_MAX];

    /* Got a common base for the merge.
    ** What we do with this is get the list of object/cn pairs from
    ** zRemote to zBase's parent and tack them on to the comment.
    */
    if( zModule[0] ) {




      snprintf(zCommit,sizeof(zCommit),"%s:%s",zModule,zRemote);
    } else {
      strncpy(zCommit,zRemote,sizeof(zCommit));
      zCommit[sizeof(zCommit)-1] = 0;
    }

    while( zCommit[0] && strcmp(zCommit,zBase) ){
      char *z;
      char **azChng = db_query("SELECT cn,prevvers FROM filechng "
                               "WHERE vers='%q' LIMIT 1", zCommit);
      if( azChng[0]==0 ) break; /* maybe pruned? */
      
      z = mprintf("[%d], %s", atoi(azChng[0]), zComment);







>
>
>
>





>







403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
    char zCommit[PATH_MAX];

    /* Got a common base for the merge.
    ** What we do with this is get the list of object/cn pairs from
    ** zRemote to zBase's parent and tack them on to the comment.
    */
    if( zModule[0] ) {
      /* we'll be comparing commits to this, too */
      strcpy(zCommit,zBase);
      snprintf(zBase,sizeof(zBase),"%s:%s",zModule,zCommit);

      snprintf(zCommit,sizeof(zCommit),"%s:%s",zModule,zRemote);
    } else {
      strncpy(zCommit,zRemote,sizeof(zCommit));
      zCommit[sizeof(zCommit)-1] = 0;
    }

    while( zCommit[0] && strcmp(zCommit,zBase) ){
      char *z;
      char **azChng = db_query("SELECT cn,prevvers FROM filechng "
                               "WHERE vers='%q' LIMIT 1", zCommit);
      if( azChng[0]==0 ) break; /* maybe pruned? */
      
      z = mprintf("[%d], %s", atoi(azChng[0]), zComment);