Skip to content

Commit f016f22

Browse files
SimonCroppSimonCropp
committed
.
1 parent 5b0fb0f commit f016f22

File tree

4 files changed

+50
-1
lines changed

4 files changed

+50
-1
lines changed

‎docs/diff-tool.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
146146
* Supports auto-refresh: True
147147
* Supports text files: True
148148
* Use shell execute: True
149+
* Create no window: False
149150
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
150151
* Supported binaries: .7z, .bcpkg, .bin, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .iso, .jar, .jpeg, .jpg, .kmz, .nupkg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tbz2, .tgz, .tif, .tiff, .war, .webp, .wim, .xlsx, .xz, .zip, .zipx
151152

@@ -216,6 +217,7 @@ DiffTools.UseOrder(DiffTool.BeyondCompare);
216217
* Supports auto-refresh: True
217218
* Supports text files: True
218219
* Use shell execute: True
220+
* Create no window: False
219221
* Environment variable for custom install location: `DiffEngine_DeltaWalker`
220222
* Supported binaries: .bmp, .bz2, .doc, .docx, .ear, .gif, .gz, .htm, .html, .ico, .j2k, .jar, .jp2, .jpg, .pbm, .pct, .pdf, .pgm, .pic, .pict, .png, .pnm, .ppm, .ppt, .psd, .rtf, .svg, .tar, .tbz2, .tgz, .tif, .xls, .xlsx, .zip
221223

@@ -268,6 +270,7 @@ DiffTools.UseOrder(DiffTool.DeltaWalker);
268270
* Supports auto-refresh: True
269271
* Supports text files: True
270272
* Use shell execute: True
273+
* Create no window: False
271274
* Environment variable for custom install location: `DiffEngine_Diffinity`
272275
* Supported binaries: .svg
273276

@@ -302,6 +305,7 @@ DiffTools.UseOrder(DiffTool.Diffinity);
302305
* Supports auto-refresh: True
303306
* Supports text files: True
304307
* Use shell execute: True
308+
* Create no window: False
305309
* Environment variable for custom install location: `DiffEngine_ExamDiff`
306310
* Supported binaries: .bin, .svg
307311

@@ -342,6 +346,7 @@ DiffTools.UseOrder(DiffTool.ExamDiff);
342346
* Supports auto-refresh: False
343347
* Supports text files: True
344348
* Use shell execute: True
349+
* Create no window: False
345350
* Environment variable for custom install location: `DiffEngine_Guiffy`
346351
* Supported binaries: .bmp, .gif, .jpeg, .jpg, .png, .svg, .wbmp
347352

@@ -397,6 +402,7 @@ DiffTools.UseOrder(DiffTool.Guiffy);
397402
* Supports auto-refresh: True
398403
* Supports text files: True
399404
* Use shell execute: True
405+
* Create no window: False
400406
* Environment variable for custom install location: `DiffEngine_Kaleidoscope`
401407
* Supported binaries: .bin, .bmp, .gif, .ico, .jpeg, .jpg, .png, .svg, .tif, .tiff
402408

@@ -428,6 +434,7 @@ DiffTools.UseOrder(DiffTool.Kaleidoscope);
428434
* Supports auto-refresh: False
429435
* Supports text files: True
430436
* Use shell execute: True
437+
* Create no window: False
431438
* Environment variable for custom install location: `DiffEngine_KDiff3`
432439
* Supported binaries: .svg
433440

@@ -483,6 +490,7 @@ DiffTools.UseOrder(DiffTool.KDiff3);
483490
* Supports auto-refresh: False
484491
* Supports text files: False
485492
* Use shell execute: False
493+
* Create no window: True
486494
* Environment variable for custom install location: `DiffEngine_MsWordDiff`
487495
* Supported binaries: .doc, .docx
488496

@@ -521,6 +529,7 @@ DiffTools.UseOrder(DiffTool.MsWordDiff);
521529
* Supports auto-refresh: False
522530
* Supports text files: True
523531
* Use shell execute: True
532+
* Create no window: False
524533
* Environment variable for custom install location: `DiffEngine_Neovim`
525534
* Supported binaries: .svg
526535

@@ -583,6 +592,7 @@ DiffTools.UseOrder(DiffTool.Neovim);
583592
* Supports auto-refresh: False
584593
* Supports text files: True
585594
* Use shell execute: True
595+
* Create no window: False
586596
* Environment variable for custom install location: `DiffEngine_P4Merge`
587597
* Supported binaries: .bmp, .gif, .jpeg, .jpg, .pbm, .pgm, .png, .ppm, .svg, .tif, .tiff, .xbm, .xpm
588598

@@ -668,6 +678,7 @@ DiffTools.UseOrder(DiffTool.P4Merge);
668678
* Supports auto-refresh: True
669679
* Supports text files: True
670680
* Use shell execute: True
681+
* Create no window: False
671682
* Environment variable for custom install location: `DiffEngine_Rider`
672683
* Supported binaries: .svg
673684

@@ -736,6 +747,7 @@ DiffTools.UseOrder(DiffTool.Rider);
736747
* Supports auto-refresh: False
737748
* Supports text files: True
738749
* Use shell execute: True
750+
* Create no window: False
739751
* Environment variable for custom install location: `DiffEngine_TkDiff`
740752
* Supported binaries: .svg
741753

@@ -768,6 +780,7 @@ DiffTools.UseOrder(DiffTool.TkDiff);
768780
* Supports auto-refresh: False
769781
* Supports text files: False
770782
* Use shell execute: True
783+
* Create no window: False
771784
* Environment variable for custom install location: `DiffEngine_TortoiseGitIDiff`
772785
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .tif, .tiff
773786

@@ -802,6 +815,7 @@ DiffTools.UseOrder(DiffTool.TortoiseGitIDiff);
802815
* Supports auto-refresh: False
803816
* Supports text files: True
804817
* Use shell execute: True
818+
* Create no window: False
805819
* Environment variable for custom install location: `DiffEngine_TortoiseGitMerge`
806820
* Supported binaries: .bin, .svg
807821

@@ -836,6 +850,7 @@ DiffTools.UseOrder(DiffTool.TortoiseGitMerge);
836850
* Supports auto-refresh: False
837851
* Supports text files: False
838852
* Use shell execute: True
853+
* Create no window: False
839854
* Environment variable for custom install location: `DiffEngine_TortoiseIDiff`
840855
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .tif, .tiff
841856

@@ -870,6 +885,7 @@ DiffTools.UseOrder(DiffTool.TortoiseIDiff);
870885
* Supports auto-refresh: False
871886
* Supports text files: True
872887
* Use shell execute: True
888+
* Create no window: False
873889
* Environment variable for custom install location: `DiffEngine_TortoiseMerge`
874890
* Supported binaries: .svg
875891

@@ -904,6 +920,7 @@ DiffTools.UseOrder(DiffTool.TortoiseMerge);
904920
* Supports auto-refresh: True
905921
* Supports text files: True
906922
* Use shell execute: True
923+
* Create no window: False
907924
* Environment variable for custom install location: `DiffEngine_Vim`
908925
* Supported binaries: .svg
909926

@@ -960,6 +977,7 @@ DiffTools.UseOrder(DiffTool.Vim);
960977
* Supports auto-refresh: True
961978
* Supports text files: True
962979
* Use shell execute: True
980+
* Create no window: False
963981
* Environment variable for custom install location: `DiffEngine_WinMerge`
964982
* Supported binaries: .bin, .bmp, .bw, .cut, .dds, .exr, .g3, .gif, .hdp, .hdr, .ico, .iff, .j2c, .j2k, .jif, .jng, .jp2, .jpe, .jpeg, .jpg, .jxr, .koa, .lbm, .mng, .pbm, .pcd, .pct, .pcx, .pfm, .pgm, .pic, .pict, .png, .ppm, .psd, .ras, .rgb, .rgba, .sgi, .svg, .targa, .tga, .tif, .tiff, .wap, .wbm, .wbmp, .wdp, .webp, .xbm, .xpm
965983

@@ -1007,6 +1025,7 @@ DiffTools.UseOrder(DiffTool.WinMerge);
10071025
* Supports auto-refresh: True
10081026
* Supports text files: True
10091027
* Use shell execute: True
1028+
* Create no window: False
10101029
* Environment variable for custom install location: `DiffEngine_AraxisMerge`
10111030
* Supported binaries: .bmp, .dib, .emf, .gif, .j2c, .j2k, .jif, .jp2, .jpc, .jpeg, .jpg, .jpx, .pbm, .pcx, .pgm, .png, .ppm, .ras, .svg, .tga, .tif, .tiff, .wmf
10121031

@@ -1062,6 +1081,7 @@ DiffTools.UseOrder(DiffTool.AraxisMerge);
10621081
* Supports auto-refresh: True
10631082
* Supports text files: True
10641083
* Use shell execute: False
1084+
* Create no window: False
10651085
* Environment variable for custom install location: `DiffEngine_Cursor`
10661086
* Supported binaries: .bin, .svg
10671087

@@ -1127,6 +1147,7 @@ DiffTools.UseOrder(DiffTool.Cursor);
11271147
* Supports auto-refresh: False
11281148
* Supports text files: True
11291149
* Use shell execute: True
1150+
* Create no window: False
11301151
* Environment variable for custom install location: `DiffEngine_Meld`
11311152
* Supported binaries: .svg
11321153

@@ -1193,6 +1214,7 @@ DiffTools.UseOrder(DiffTool.Meld);
11931214
* Supports auto-refresh: False
11941215
* Supports text files: True
11951216
* Use shell execute: True
1217+
* Create no window: False
11961218
* Environment variable for custom install location: `DiffEngine_SublimeMerge`
11971219
* Supported binaries: .svg
11981220

@@ -1258,6 +1280,7 @@ DiffTools.UseOrder(DiffTool.SublimeMerge);
12581280
* Supports auto-refresh: True
12591281
* Supports text files: True
12601282
* Use shell execute: True
1283+
* Create no window: False
12611284
* Environment variable for custom install location: `DiffEngine_VisualStudio`
12621285
* Supported binaries: .svg
12631286

@@ -1301,6 +1324,7 @@ DiffTools.UseOrder(DiffTool.VisualStudio);
13011324
* Supports auto-refresh: True
13021325
* Supports text files: True
13031326
* Use shell execute: False
1327+
* Create no window: False
13041328
* Environment variable for custom install location: `DiffEngine_VisualStudioCode`
13051329
* Supported binaries: .bin, .svg
13061330

‎src/DiffEngine.Tests/DefinitionsTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ static void AddTool(StreamWriter writer, Definition tool)
125125
* Supports auto-refresh: {tool.AutoRefresh}
126126
* Supports text files: {tool.SupportsText}
127127
* Use shell execute: {tool.UseShellExecute}
128+
* Create no window: {tool.CreateNoWindow}
128129
* Environment variable for custom install location: `DiffEngine_{tool.Tool}`
129130
""");
130131

‎src/DiffEngine.Tests/diffTools.include.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
1111
* Supports auto-refresh: True
1212
* Supports text files: True
1313
* Use shell execute: True
14+
* Create no window: False
1415
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
1516
* Supported binaries: .7z, .bcpkg, .bin, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .iso, .jar, .jpeg, .jpg, .kmz, .nupkg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tbz2, .tgz, .tif, .tiff, .war, .webp, .wim, .xlsx, .xz, .zip, .zipx
1617

@@ -81,6 +82,7 @@ DiffTools.UseOrder(DiffTool.BeyondCompare);
8182
* Supports auto-refresh: True
8283
* Supports text files: True
8384
* Use shell execute: True
85+
* Create no window: False
8486
* Environment variable for custom install location: `DiffEngine_DeltaWalker`
8587
* Supported binaries: .bmp, .bz2, .doc, .docx, .ear, .gif, .gz, .htm, .html, .ico, .j2k, .jar, .jp2, .jpg, .pbm, .pct, .pdf, .pgm, .pic, .pict, .png, .pnm, .ppm, .ppt, .psd, .rtf, .svg, .tar, .tbz2, .tgz, .tif, .xls, .xlsx, .zip
8688

@@ -133,6 +135,7 @@ DiffTools.UseOrder(DiffTool.DeltaWalker);
133135
* Supports auto-refresh: True
134136
* Supports text files: True
135137
* Use shell execute: True
138+
* Create no window: False
136139
* Environment variable for custom install location: `DiffEngine_Diffinity`
137140
* Supported binaries: .svg
138141

@@ -167,6 +170,7 @@ DiffTools.UseOrder(DiffTool.Diffinity);
167170
* Supports auto-refresh: True
168171
* Supports text files: True
169172
* Use shell execute: True
173+
* Create no window: False
170174
* Environment variable for custom install location: `DiffEngine_ExamDiff`
171175
* Supported binaries: .bin, .svg
172176

@@ -207,6 +211,7 @@ DiffTools.UseOrder(DiffTool.ExamDiff);
207211
* Supports auto-refresh: False
208212
* Supports text files: True
209213
* Use shell execute: True
214+
* Create no window: False
210215
* Environment variable for custom install location: `DiffEngine_Guiffy`
211216
* Supported binaries: .bmp, .gif, .jpeg, .jpg, .png, .svg, .wbmp
212217

@@ -262,6 +267,7 @@ DiffTools.UseOrder(DiffTool.Guiffy);
262267
* Supports auto-refresh: True
263268
* Supports text files: True
264269
* Use shell execute: True
270+
* Create no window: False
265271
* Environment variable for custom install location: `DiffEngine_Kaleidoscope`
266272
* Supported binaries: .bin, .bmp, .gif, .ico, .jpeg, .jpg, .png, .svg, .tif, .tiff
267273

@@ -293,6 +299,7 @@ DiffTools.UseOrder(DiffTool.Kaleidoscope);
293299
* Supports auto-refresh: False
294300
* Supports text files: True
295301
* Use shell execute: True
302+
* Create no window: False
296303
* Environment variable for custom install location: `DiffEngine_KDiff3`
297304
* Supported binaries: .svg
298305

@@ -348,6 +355,7 @@ DiffTools.UseOrder(DiffTool.KDiff3);
348355
* Supports auto-refresh: False
349356
* Supports text files: False
350357
* Use shell execute: False
358+
* Create no window: True
351359
* Environment variable for custom install location: `DiffEngine_MsWordDiff`
352360
* Supported binaries: .doc, .docx
353361

@@ -386,6 +394,7 @@ DiffTools.UseOrder(DiffTool.MsWordDiff);
386394
* Supports auto-refresh: False
387395
* Supports text files: True
388396
* Use shell execute: True
397+
* Create no window: False
389398
* Environment variable for custom install location: `DiffEngine_Neovim`
390399
* Supported binaries: .svg
391400

@@ -448,6 +457,7 @@ DiffTools.UseOrder(DiffTool.Neovim);
448457
* Supports auto-refresh: False
449458
* Supports text files: True
450459
* Use shell execute: True
460+
* Create no window: False
451461
* Environment variable for custom install location: `DiffEngine_P4Merge`
452462
* Supported binaries: .bmp, .gif, .jpeg, .jpg, .pbm, .pgm, .png, .ppm, .svg, .tif, .tiff, .xbm, .xpm
453463

@@ -533,6 +543,7 @@ DiffTools.UseOrder(DiffTool.P4Merge);
533543
* Supports auto-refresh: True
534544
* Supports text files: True
535545
* Use shell execute: True
546+
* Create no window: False
536547
* Environment variable for custom install location: `DiffEngine_Rider`
537548
* Supported binaries: .svg
538549

@@ -601,6 +612,7 @@ DiffTools.UseOrder(DiffTool.Rider);
601612
* Supports auto-refresh: False
602613
* Supports text files: True
603614
* Use shell execute: True
615+
* Create no window: False
604616
* Environment variable for custom install location: `DiffEngine_TkDiff`
605617
* Supported binaries: .svg
606618

@@ -633,6 +645,7 @@ DiffTools.UseOrder(DiffTool.TkDiff);
633645
* Supports auto-refresh: False
634646
* Supports text files: False
635647
* Use shell execute: True
648+
* Create no window: False
636649
* Environment variable for custom install location: `DiffEngine_TortoiseGitIDiff`
637650
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .tif, .tiff
638651

@@ -667,6 +680,7 @@ DiffTools.UseOrder(DiffTool.TortoiseGitIDiff);
667680
* Supports auto-refresh: False
668681
* Supports text files: True
669682
* Use shell execute: True
683+
* Create no window: False
670684
* Environment variable for custom install location: `DiffEngine_TortoiseGitMerge`
671685
* Supported binaries: .bin, .svg
672686

@@ -701,6 +715,7 @@ DiffTools.UseOrder(DiffTool.TortoiseGitMerge);
701715
* Supports auto-refresh: False
702716
* Supports text files: False
703717
* Use shell execute: True
718+
* Create no window: False
704719
* Environment variable for custom install location: `DiffEngine_TortoiseIDiff`
705720
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .tif, .tiff
706721

@@ -735,6 +750,7 @@ DiffTools.UseOrder(DiffTool.TortoiseIDiff);
735750
* Supports auto-refresh: False
736751
* Supports text files: True
737752
* Use shell execute: True
753+
* Create no window: False
738754
* Environment variable for custom install location: `DiffEngine_TortoiseMerge`
739755
* Supported binaries: .svg
740756

@@ -769,6 +785,7 @@ DiffTools.UseOrder(DiffTool.TortoiseMerge);
769785
* Supports auto-refresh: True
770786
* Supports text files: True
771787
* Use shell execute: True
788+
* Create no window: False
772789
* Environment variable for custom install location: `DiffEngine_Vim`
773790
* Supported binaries: .svg
774791

@@ -825,6 +842,7 @@ DiffTools.UseOrder(DiffTool.Vim);
825842
* Supports auto-refresh: True
826843
* Supports text files: True
827844
* Use shell execute: True
845+
* Create no window: False
828846
* Environment variable for custom install location: `DiffEngine_WinMerge`
829847
* Supported binaries: .bin, .bmp, .bw, .cut, .dds, .exr, .g3, .gif, .hdp, .hdr, .ico, .iff, .j2c, .j2k, .jif, .jng, .jp2, .jpe, .jpeg, .jpg, .jxr, .koa, .lbm, .mng, .pbm, .pcd, .pct, .pcx, .pfm, .pgm, .pic, .pict, .png, .ppm, .psd, .ras, .rgb, .rgba, .sgi, .svg, .targa, .tga, .tif, .tiff, .wap, .wbm, .wbmp, .wdp, .webp, .xbm, .xpm
830848

@@ -872,6 +890,7 @@ DiffTools.UseOrder(DiffTool.WinMerge);
872890
* Supports auto-refresh: True
873891
* Supports text files: True
874892
* Use shell execute: True
893+
* Create no window: False
875894
* Environment variable for custom install location: `DiffEngine_AraxisMerge`
876895
* Supported binaries: .bmp, .dib, .emf, .gif, .j2c, .j2k, .jif, .jp2, .jpc, .jpeg, .jpg, .jpx, .pbm, .pcx, .pgm, .png, .ppm, .ras, .svg, .tga, .tif, .tiff, .wmf
877896

@@ -927,6 +946,7 @@ DiffTools.UseOrder(DiffTool.AraxisMerge);
927946
* Supports auto-refresh: True
928947
* Supports text files: True
929948
* Use shell execute: False
949+
* Create no window: False
930950
* Environment variable for custom install location: `DiffEngine_Cursor`
931951
* Supported binaries: .bin, .svg
932952

@@ -992,6 +1012,7 @@ DiffTools.UseOrder(DiffTool.Cursor);
9921012
* Supports auto-refresh: False
9931013
* Supports text files: True
9941014
* Use shell execute: True
1015+
* Create no window: False
9951016
* Environment variable for custom install location: `DiffEngine_Meld`
9961017
* Supported binaries: .svg
9971018

@@ -1058,6 +1079,7 @@ DiffTools.UseOrder(DiffTool.Meld);
10581079
* Supports auto-refresh: False
10591080
* Supports text files: True
10601081
* Use shell execute: True
1082+
* Create no window: False
10611083
* Environment variable for custom install location: `DiffEngine_SublimeMerge`
10621084
* Supported binaries: .svg
10631085

@@ -1123,6 +1145,7 @@ DiffTools.UseOrder(DiffTool.SublimeMerge);
11231145
* Supports auto-refresh: True
11241146
* Supports text files: True
11251147
* Use shell execute: True
1148+
* Create no window: False
11261149
* Environment variable for custom install location: `DiffEngine_VisualStudio`
11271150
* Supported binaries: .svg
11281151

@@ -1166,6 +1189,7 @@ DiffTools.UseOrder(DiffTool.VisualStudio);
11661189
* Supports auto-refresh: True
11671190
* Supports text files: True
11681191
* Use shell execute: False
1192+
* Create no window: False
11691193
* Environment variable for custom install location: `DiffEngine_VisualStudioCode`
11701194
* Supported binaries: .bin, .svg
11711195

0 commit comments

Comments
 (0)