Fossil

Check-in [de30eec2]
Login

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

Overview
Comment:Code normalization; tabs->spaces.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | jan-manifest-tags
Files: files | file ages | folders
SHA1: de30eec201b6100df0ac081077c7d53e45089d7c
User & Date: jan 2016-01-04 00:36:40
Context
2016-01-04
02:16
Conditionally save manifests on commit. check-in: 46b9adb7 user: jan tags: jan-manifest-tags
00:36
Code normalization; tabs->spaces. check-in: de30eec2 user: jan tags: jan-manifest-tags
00:28
Add manifest.tags to generated zips, and decouple manifest and manifest.uuid. check-in: aed6fe53 user: jan tags: jan-manifest-tags
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/add.c.

77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
  ** is used
  */
  static const struct {
    const char *fname;
    int flg;
  }aManifestflags[] = {
    { "manifest",      MFESTFLG_RAW },
	 { "manifest.uuid", MFESTFLG_UUID },
	 { "manifest.tags", MFESTFLG_TAGS }
  };
  static const char *azManifests[3];

  /*
  ** Names of repository files, if they exist in the checkout.
  */
  static const char *azRepo[4] = { 0, 0, 0, 0 };







|
|







77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
  ** is used
  */
  static const struct {
    const char *fname;
    int flg;
  }aManifestflags[] = {
    { "manifest",      MFESTFLG_RAW },
    { "manifest.uuid", MFESTFLG_UUID },
    { "manifest.tags", MFESTFLG_TAGS }
  };
  static const char *azManifests[3];

  /*
  ** Names of repository files, if they exist in the checkout.
  */
  static const char *azRepo[4] = { 0, 0, 0, 0 };

Changes to src/checkout.c.

145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
    if( flg & (MFESTFLG_RAW|MFESTFLG_UUID) ){
      blob_zero(&manifest);
      content_get(vid, &manifest);
      zManFile = mprintf("%smanifest", g.zLocalRoot);
      blob_zero(&hash);
      sha1sum_blob(&manifest, &hash);
      sterilize_manifest(&manifest);
		if( flg & MFESTFLG_RAW ){
        blob_write_to_file(&manifest, zManFile);
      }
      free(zManFile);
    }
	 if( flg & MFESTFLG_UUID ){
      zManFile = mprintf("%smanifest.uuid", g.zLocalRoot);
      blob_append(&hash, "\n", 1);
      blob_write_to_file(&hash, zManFile);
      free(zManFile);
      blob_reset(&hash);
    }
	 if( flg & MFESTFLG_TAGS ){
      blob_zero(&taglist);
      zManFile = mprintf("%smanifest.tags", g.zLocalRoot);
      get_checkin_taglist(vid, &taglist);
      blob_write_to_file(&taglist, zManFile);
      free(zManFile);
    }
  }else{







|




|






|







145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
    if( flg & (MFESTFLG_RAW|MFESTFLG_UUID) ){
      blob_zero(&manifest);
      content_get(vid, &manifest);
      zManFile = mprintf("%smanifest", g.zLocalRoot);
      blob_zero(&hash);
      sha1sum_blob(&manifest, &hash);
      sterilize_manifest(&manifest);
      if( flg & MFESTFLG_RAW ){
        blob_write_to_file(&manifest, zManFile);
      }
      free(zManFile);
    }
    if( flg & MFESTFLG_UUID ){
      zManFile = mprintf("%smanifest.uuid", g.zLocalRoot);
      blob_append(&hash, "\n", 1);
      blob_write_to_file(&hash, zManFile);
      free(zManFile);
      blob_reset(&hash);
    }
    if( flg & MFESTFLG_TAGS ){
      blob_zero(&taglist);
      zManFile = mprintf("%smanifest.tags", g.zLocalRoot);
      get_checkin_taglist(vid, &taglist);
      blob_write_to_file(&taglist, zManFile);
      free(zManFile);
    }
  }else{