Skip to content

Commit cbcdc5b

Browse files
authored
Merge pull request #816 from cambot/feature/add-xslts-to-baseline
Enhance baseline to include XSL transforms.
2 parents d6007c1 + e781f1d commit cbcdc5b

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [2.13.0] - Unreleased
99

10+
### Added
11+
- Expanded Baseline Export to include XSL Transforms (#815)
12+
1013
### Fixed
1114
- Fix Import All not importing items that do not already exist when compileOnImport is not set (#798)
1215
- Fix baselining output more consistent, human readable (#814)

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Embedded Git support for InterSystems platforms, supporting unified source contr
1010

1111
## Installation and Setup
1212

13-
1. Load this repository into IRIS from the community package registry.
13+
1. Load this repository into IRIS from the community package registry.
1414
```
1515
zpm "install git-source-control"
1616
```
@@ -24,7 +24,7 @@ Embedded Git support for InterSystems platforms, supporting unified source contr
2424
d ##class(SourceControl.Git.API).Configure()
2525
```
2626
This will also allow you to generate an SSH key for use as (e.g.) a deploy key and to initialize or clone a git repo.
27-
3. If using VSCode: Set up `isfs` server-side editing. First, save your current workspace in which you have the code open. Then, open the `.code-workspace` file generated by VS Code and add the following to the list of folders:
27+
3. If using VSCode: Set up `isfs` server-side editing. First, save your current workspace in which you have the code open. Then, open the `.code-workspace` file generated by VS Code and add the following to the list of folders:
2828
```
2929
{
3030
"name": "<whatever you want the folder to show up as in the project explorer view>",
@@ -87,6 +87,8 @@ This might look like:
8787
8888
![Example of mapping configuration](docs/images/settings.PNG "Example of mapping configuration")
8989
90+
Additional documentation on file types [can be found here](https://docs.intersystems.com/services/csp/docbook/DocBook.UI.Page.cls?KEY=AGITLAB#AGITLAB_settings_mappings).
91+
9092
### Baselining Source Code
9193
If enabling source control on an existing system, you will need to create a baseline by exporting all existing items to the Git repository. See [our documentation on baselining](/docs/baselining.md).
9294

cls/SourceControl/Git/Utils.cls

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,19 +1571,19 @@ ClassMethod ImportRoutines(force As %Boolean = 0, pullEventClass As %String) As
15711571
// If there is a config file it must be imported before everything else.
15721572
if $Data(itemList(##class(SourceControl.Git.Settings.Document).#INTERNALNAME)) {
15731573
set sc = ##class(SourceControl.Git.Utils).ImportItem(##class(SourceControl.Git.Settings.Document).#INTERNALNAME, force)
1574-
1574+
15751575
if $$$ISERR(sc) {
15761576
set ec = $$$ADDSC(ec, sc)
15771577
} else {
15781578
kill err, itemList
15791579
set err = 0
1580-
1580+
15811581
// Get the item list again as it may be different after just importing the config file
15821582
set ec = $$$ADDSC(ec, ..ListItemsInFiles(.itemList, .err))
15831583
}
15841584
quit:'ec ec
15851585
}
1586-
1586+
15871587
kill files
15881588

15891589
set settings = ##class(SourceControl.Git.Settings).%New()
@@ -3047,7 +3047,7 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
30473047
try {
30483048
write !, "Exporting items..."
30493049
set rs = ##class(%Library.RoutineMgr).StudioOpenDialogFunc(
3050-
"*.mac,*.int,*.inc,*.cls,*.csp,*.HL7,*.LUT,*.AST,*.X12"
3050+
"*.mac,*.int,*.inc,*.cls,*.csp,*.xsl,*.HL7,*.LUT,*.AST,*.X12"
30513051
, , ,0 // SystemFiles
30523052
,1 // Flat
30533053
,0 // NotStudio

0 commit comments

Comments
 (0)