7a63a1c9be3280f1ce43839a7e0981e4b4aaf072 galt Mon May 21 12:07:47 2012 -0700 merge-and-squash dev branch hgFindSpecReleaseTag diff --git src/hg/inc/hgFindSpec.h src/hg/inc/hgFindSpec.h index 1088fde..96324ac 100644 --- src/hg/inc/hgFindSpec.h +++ src/hg/inc/hgFindSpec.h @@ -62,31 +62,31 @@ void hgFindSpecOutput(struct hgFindSpec *el, FILE *f, char sep, char lastSep); /* Print out hgFindSpec. Separate fields with sep. Follow last field with lastSep. */ #define hgFindSpecTabOut(el,f) hgFindSpecOutput(el,f,'\t','\n'); /* Print out hgFindSpec as a line in a tab-separated file. */ #define hgFindSpecCommaOut(el,f) hgFindSpecOutput(el,f,',',','); /* Print out hgFindSpec as a comma separated list including final comma. */ /* -------------------------------- End autoSql Generated Code -------------------------------- */ int hgFindSpecCmp(const void *va, const void *vb); /* Compare to sort based on searchPriority. */ -struct hgFindSpec *hgFindSpecFromRa(char *db, char *raFile); +struct hgFindSpec *hgFindSpecFromRa(char *db, char *raFile, char *releaseTag); /* Load track info from ra file into list. */ char *hgFindSpecSetting(struct hgFindSpec *hfs, char *name); /* Return setting string or NULL if none exists. */ char *hgFindSpecRequiredSetting(struct hgFindSpec *hfs, char *name); /* Return setting string or squawk and die. */ char *hgFindSpecSettingOrDefault(struct hgFindSpec *hfs, char *name, char *defaultVal); /* Return setting string, or defaultVal if none exists */ struct hgFindSpec *hgFindSpecGetSpecs(char *db, boolean shortCircuit); /* Load all short-circuit (or not) search specs from the current db, sorted by * searchPriority. */