Response to Issue #2198: loadup and medley scripts can now store/retrieve loadup files to/from named subdirectories of MEDLEYDIR/loadups (#2200)
* Add to loadup and medley scripts a --branch argument whereby which loadup outputs are stored in MEDLEYDIR/loadups/branches/BRANCH, where BRANCH is the name of the currently active git branch of MEDLEYDIR (for loadup) or the name of a BRANCH whereby which a loadup had been run with the --branch option (for medley). Man pages updated accordingly. * Removed --git-branch synonym for --branch from both medley and loadup scripts. Added optional BRANCH argument to --branch in loadup script. If BRANCH is specified iot is used as the (pseudo)branch name instead of the current active git branch of MEDLEYDIR. If BRANCH is "-", the current git branch name is used. * When doing loadups, a file called gitinfo is created in the LOADUP_OUTDIR that contains the git commit, git branch and git status of MEDLEYDIR at the time of the loadup. Branch names in loadup and medley scripts now contain only alphanumerics, dahes, underscores, periods. Any other character is coerced to underscore. The branch name is now included in the window title. * Incorporate changes from PR#2208: Use the loadup step script names as the --id string. * Add loadups/gitinfo and loadups/branches to .gitignore
This commit is contained in:
@@ -293,6 +293,16 @@ that detects Xvnc server failures. Setting this flag notifies Medley
|
||||
that very short Medley sessions are possible and the Xvnc error
|
||||
detection needs to be adjusted accordingly.</p>
|
||||
</dd>
|
||||
<dt>-br [<em>BRANCH</em> | -], --branch [<em>BRANCH</em> | -]</dt>
|
||||
<dd>
|
||||
<p>By default, sysout files are loaded from the MEDLEYDIR/loadups
|
||||
directory. If “--branch <em>BRANCH</em>” is specified, then by default
|
||||
sysout files are loaded from the MEDLEYDIR/loadups/branches/BRANCH
|
||||
directory. The sysouts in these directories are created using a loadups
|
||||
script with the --branch flag set. See the loadup man page. If
|
||||
<em>BRANCH</em> is “-”, then the name of the active git branch for
|
||||
MEDLEYDIR (if any) is used as <em>BRANCH</em>.</p>
|
||||
</dd>
|
||||
</dl>
|
||||
<h2>Other Options</h2>
|
||||
<dl>
|
||||
|
||||
@@ -395,6 +395,18 @@ This can cause issues with medley code that detects Xvnc server
|
||||
failures.
|
||||
Setting this flag notifies Medley that very short Medley sessions are
|
||||
possible and the Xvnc error detection needs to be adjusted accordingly.
|
||||
.TP
|
||||
-br [\f[I]BRANCH\f[R] | -], --branch [\f[I]BRANCH\f[R] | -]
|
||||
By default, sysout files are loaded from the MEDLEYDIR/loadups
|
||||
directory.
|
||||
If \[lq]--branch \f[I]BRANCH\f[R]\[rq] is specified, then by default
|
||||
sysout files are loaded from the MEDLEYDIR/loadups/branches/BRANCH
|
||||
directory.
|
||||
The sysouts in these directories are created using a loadups script with
|
||||
the --branch flag set.
|
||||
See the loadup man page.
|
||||
If \f[I]BRANCH\f[R] is \[lq]-\[rq], then the name of the active git
|
||||
branch for MEDLEYDIR (if any) is used as \f[I]BRANCH\f[R].
|
||||
.SS Other Options
|
||||
.PP
|
||||
\
|
||||
|
||||
Binary file not shown.
@@ -263,6 +263,15 @@ specified in the Medley file system, not the host Windows file system.
|
||||
will run for a very short time (< a couple of seconds). This can cause issues with medley code that detects Xvnc server failures.
|
||||
Setting this flag notifies Medley that very short Medley sessions are possible and the Xvnc error detection needs to be adjusted accordingly.
|
||||
|
||||
-br [*BRANCH* | -], \-\-branch [*BRANCH* | -]
|
||||
: By default, sysout files are loaded from the MEDLEYDIR/loadups directory.
|
||||
If "\-\-branch *BRANCH*" is specified, then by default sysout files are loaded from the
|
||||
MEDLEYDIR/loadups/branches/BRANCH directory. The sysouts in these directories are created using
|
||||
a loadups script with the \-\-branch flag set. See the loadup man page.
|
||||
If *BRANCH* is "-", then the name of the active git branch for MEDLEYDIR (if any) is used as
|
||||
*BRANCH*.
|
||||
|
||||
|
||||
|
||||
Other Options
|
||||
-------------
|
||||
|
||||
Reference in New Issue
Block a user