Show More
@@ -1,97 +1,98 b'' | |||||
1 | ; System-wide Mercurial config file. |
|
1 | ; System-wide Mercurial config file. | |
2 | ; |
|
2 | ; | |
3 | ; !!! Do Not Edit This File !!! |
|
3 | ; !!! Do Not Edit This File !!! | |
4 | ; |
|
4 | ; | |
5 | ; This file will be replaced by the installer on every upgrade. |
|
5 | ; This file will be replaced by the installer on every upgrade. | |
6 | ; Editing this file can cause strange side effects on Vista. |
|
6 | ; Editing this file can cause strange side effects on Vista. | |
7 | ; |
|
7 | ; | |
8 | ; http://bitbucket.org/tortoisehg/stable/issue/135 |
|
8 | ; http://bitbucket.org/tortoisehg/stable/issue/135 | |
9 | ; |
|
9 | ; | |
10 | ; To change settings you see in this file, override (or enable) them in |
|
10 | ; To change settings you see in this file, override (or enable) them in | |
11 | ; your user Mercurial.ini file, where USERNAME is your Windows user name: |
|
11 | ; your user Mercurial.ini file, where USERNAME is your Windows user name: | |
12 | ; |
|
12 | ; | |
13 | ; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini |
|
13 | ; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini | |
14 | ; Vista or later - C:\Users\USERNAME\Mercurial.ini |
|
14 | ; Vista or later - C:\Users\USERNAME\Mercurial.ini | |
15 |
|
15 | |||
16 |
|
16 | |||
17 | [ui] |
|
17 | [ui] | |
18 | ; editor used to enter commit logs, etc. Most text editors will work. |
|
18 | ; editor used to enter commit logs, etc. Most text editors will work. | |
19 | editor = notepad |
|
19 | editor = notepad | |
20 | ; show changed files and be a bit more verbose if True |
|
20 | ; show changed files and be a bit more verbose if True | |
21 | ; verbose = True |
|
21 | ; verbose = True | |
22 |
|
22 | |||
23 | ; username data to appear in commits |
|
23 | ; username data to appear in commits | |
24 | ; it usually takes the form: Joe User <joe.user@host.com> |
|
24 | ; it usually takes the form: Joe User <joe.user@host.com> | |
25 | ; username = Joe User <j.user@example.com> |
|
25 | ; username = Joe User <j.user@example.com> | |
26 |
|
26 | |||
27 | ; In order to push/pull over ssh you must specify an ssh tool |
|
27 | ; In order to push/pull over ssh you must specify an ssh tool | |
28 | ;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2 |
|
28 | ;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2 | |
29 | ;ssh = C:\cygwin\bin\ssh |
|
29 | ;ssh = C:\cygwin\bin\ssh | |
30 |
|
30 | |||
31 | ; |
|
31 | ; | |
32 | ; For more information about mercurial extensions, start here |
|
32 | ; For more information about mercurial extensions, start here | |
33 | ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions |
|
33 | ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions | |
34 | ; |
|
34 | ; | |
35 | ; Extensions shipped with Mercurial |
|
35 | ; Extensions shipped with Mercurial | |
36 | ; |
|
36 | ; | |
37 | [extensions] |
|
37 | [extensions] | |
38 | ;acl = |
|
38 | ;acl = | |
|
39 | ;blackbox = | |||
39 | ;bugzilla = |
|
40 | ;bugzilla = | |
40 | ;children = |
|
41 | ;children = | |
41 | ;churn = |
|
42 | ;churn = | |
42 | ;color = |
|
43 | ;color = | |
43 | ;convert = |
|
44 | ;convert = | |
44 | ;eol = |
|
45 | ;eol = | |
45 | ;extdiff = |
|
46 | ;extdiff = | |
46 | ;fetch = |
|
47 | ;fetch = | |
47 | ;gpg = |
|
48 | ;gpg = | |
48 | ;graphlog = |
|
49 | ;graphlog = | |
49 | ;hgcia = |
|
50 | ;hgcia = | |
50 | ;hgk = |
|
51 | ;hgk = | |
51 | ;highlight = |
|
52 | ;highlight = | |
52 | ;histedit = |
|
53 | ;histedit = | |
53 | ;interhg = |
|
54 | ;interhg = | |
54 | ;largefiles = |
|
55 | ;largefiles = | |
55 | ;keyword = |
|
56 | ;keyword = | |
56 | ;mq = |
|
57 | ;mq = | |
57 | ;notify = |
|
58 | ;notify = | |
58 | ;pager = |
|
59 | ;pager = | |
59 | ;patchbomb = |
|
60 | ;patchbomb = | |
60 | ;progress = |
|
61 | ;progress = | |
61 | ;purge = |
|
62 | ;purge = | |
62 | ;rebase = |
|
63 | ;rebase = | |
63 | ;record = |
|
64 | ;record = | |
64 | ;relink = |
|
65 | ;relink = | |
65 | ;schemes = |
|
66 | ;schemes = | |
66 | ;share = |
|
67 | ;share = | |
67 | ;transplant = |
|
68 | ;transplant = | |
68 | ;win32mbcs = |
|
69 | ;win32mbcs = | |
69 | ;zeroconf = |
|
70 | ;zeroconf = | |
70 |
|
71 | |||
71 | ; |
|
72 | ; | |
72 | ; Define external diff commands |
|
73 | ; Define external diff commands | |
73 | ; |
|
74 | ; | |
74 | [extdiff] |
|
75 | [extdiff] | |
75 | ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe |
|
76 | ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe | |
76 | ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe |
|
77 | ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe | |
77 | ;cmd.vimdiff = gvim.exe |
|
78 | ;cmd.vimdiff = gvim.exe | |
78 | ;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))" |
|
79 | ;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))" | |
79 |
|
80 | |||
80 |
|
81 | |||
81 | [hgk] |
|
82 | [hgk] | |
82 | ; Replace the following with your path to hgk, uncomment it and |
|
83 | ; Replace the following with your path to hgk, uncomment it and | |
83 | ; install ActiveTcl (or another win32 port like tclkit) |
|
84 | ; install ActiveTcl (or another win32 port like tclkit) | |
84 | ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl" |
|
85 | ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl" | |
85 | ; vdiff=vdiff |
|
86 | ; vdiff=vdiff | |
86 |
|
87 | |||
87 |
|
88 | |||
88 | ; |
|
89 | ; | |
89 | ; The git extended diff format can represent binary files, file |
|
90 | ; The git extended diff format can represent binary files, file | |
90 | ; permission changes, and rename information that the normal patch format |
|
91 | ; permission changes, and rename information that the normal patch format | |
91 | ; cannot describe. However it is also not compatible with tools which |
|
92 | ; cannot describe. However it is also not compatible with tools which | |
92 | ; expect normal patches. so enable git patches at your own risk. |
|
93 | ; expect normal patches. so enable git patches at your own risk. | |
93 | ; |
|
94 | ; | |
94 | [diff] |
|
95 | [diff] | |
95 | ;git = false |
|
96 | ;git = false | |
96 | ;nodates = false |
|
97 | ;nodates = false | |
97 |
|
98 |
@@ -1,148 +1,146 b'' | |||||
1 | ; Script generated by the Inno Setup Script Wizard. |
|
1 | ; Script generated by the Inno Setup Script Wizard. | |
2 | ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! |
|
2 | ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! | |
3 |
|
3 | |||
4 | #ifndef VERSION |
|
4 | #ifndef VERSION | |
5 | #define FileHandle |
|
5 | #define FileHandle | |
6 | #define FileLine |
|
6 | #define FileLine | |
7 | #define VERSION = "unknown" |
|
7 | #define VERSION = "unknown" | |
8 | #if FileHandle = FileOpen(SourcePath + "\..\..\mercurial\__version__.py") |
|
8 | #if FileHandle = FileOpen(SourcePath + "\..\..\mercurial\__version__.py") | |
9 | #expr FileLine = FileRead(FileHandle) |
|
9 | #expr FileLine = FileRead(FileHandle) | |
10 | #expr FileLine = FileRead(FileHandle) |
|
10 | #expr FileLine = FileRead(FileHandle) | |
11 | #define VERSION = Copy(FileLine, Pos('"', FileLine)+1, Len(FileLine)-Pos('"', FileLine)-1) |
|
11 | #define VERSION = Copy(FileLine, Pos('"', FileLine)+1, Len(FileLine)-Pos('"', FileLine)-1) | |
12 | #endif |
|
12 | #endif | |
13 | #if FileHandle |
|
13 | #if FileHandle | |
14 | #expr FileClose(FileHandle) |
|
14 | #expr FileClose(FileHandle) | |
15 | #endif |
|
15 | #endif | |
16 | #pragma message "Detected Version: " + VERSION |
|
16 | #pragma message "Detected Version: " + VERSION | |
17 | #endif |
|
17 | #endif | |
18 |
|
18 | |||
19 | #ifndef ARCH |
|
19 | #ifndef ARCH | |
20 | #define ARCH = "x86" |
|
20 | #define ARCH = "x86" | |
21 | #endif |
|
21 | #endif | |
22 |
|
22 | |||
23 | [Setup] |
|
23 | [Setup] | |
24 | AppCopyright=Copyright 2005-2010 Matt Mackall and others |
|
24 | AppCopyright=Copyright 2005-2010 Matt Mackall and others | |
25 | AppName=Mercurial |
|
25 | AppName=Mercurial | |
26 | #if ARCH == "x64" |
|
26 | #if ARCH == "x64" | |
27 | AppVerName=Mercurial {#VERSION} (64-bit) |
|
27 | AppVerName=Mercurial {#VERSION} (64-bit) | |
28 | OutputBaseFilename=Mercurial-{#VERSION}-x64 |
|
28 | OutputBaseFilename=Mercurial-{#VERSION}-x64 | |
29 | ArchitecturesAllowed=x64 |
|
29 | ArchitecturesAllowed=x64 | |
30 | ArchitecturesInstallIn64BitMode=x64 |
|
30 | ArchitecturesInstallIn64BitMode=x64 | |
31 | #else |
|
31 | #else | |
32 | AppVerName=Mercurial {#VERSION} |
|
32 | AppVerName=Mercurial {#VERSION} | |
33 | OutputBaseFilename=Mercurial-{#VERSION} |
|
33 | OutputBaseFilename=Mercurial-{#VERSION} | |
34 | #endif |
|
34 | #endif | |
35 | InfoAfterFile=contrib/win32/postinstall.txt |
|
35 | InfoAfterFile=contrib/win32/postinstall.txt | |
36 | LicenseFile=COPYING |
|
36 | LicenseFile=COPYING | |
37 | ShowLanguageDialog=yes |
|
37 | ShowLanguageDialog=yes | |
38 | AppPublisher=Matt Mackall and others |
|
38 | AppPublisher=Matt Mackall and others | |
39 | AppPublisherURL=http://mercurial.selenic.com/ |
|
39 | AppPublisherURL=http://mercurial.selenic.com/ | |
40 | AppSupportURL=http://mercurial.selenic.com/ |
|
40 | AppSupportURL=http://mercurial.selenic.com/ | |
41 | AppUpdatesURL=http://mercurial.selenic.com/ |
|
41 | AppUpdatesURL=http://mercurial.selenic.com/ | |
42 | AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3} |
|
42 | AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3} | |
43 | AppContact=mercurial@selenic.com |
|
43 | AppContact=mercurial@selenic.com | |
44 | DefaultDirName={pf}\Mercurial |
|
44 | DefaultDirName={pf}\Mercurial | |
45 | SourceDir=..\.. |
|
45 | SourceDir=..\.. | |
46 | VersionInfoDescription=Mercurial distributed SCM (version {#VERSION}) |
|
46 | VersionInfoDescription=Mercurial distributed SCM (version {#VERSION}) | |
47 | VersionInfoCopyright=Copyright 2005-2010 Matt Mackall and others |
|
47 | VersionInfoCopyright=Copyright 2005-2010 Matt Mackall and others | |
48 | VersionInfoCompany=Matt Mackall and others |
|
48 | VersionInfoCompany=Matt Mackall and others | |
49 | InternalCompressLevel=max |
|
49 | InternalCompressLevel=max | |
50 | SolidCompression=true |
|
50 | SolidCompression=true | |
51 | SetupIconFile=contrib\win32\mercurial.ico |
|
51 | SetupIconFile=contrib\win32\mercurial.ico | |
52 | AllowNoIcons=true |
|
52 | AllowNoIcons=true | |
53 | DefaultGroupName=Mercurial |
|
53 | DefaultGroupName=Mercurial | |
54 | PrivilegesRequired=none |
|
54 | PrivilegesRequired=none | |
55 |
|
55 | |||
56 | [Files] |
|
56 | [Files] | |
57 | Source: contrib\mercurial.el; DestDir: {app}/Contrib |
|
57 | Source: contrib\mercurial.el; DestDir: {app}/Contrib | |
58 | Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim |
|
58 | Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim | |
59 | Source: contrib\zsh_completion; DestDir: {app}/Contrib |
|
59 | Source: contrib\zsh_completion; DestDir: {app}/Contrib | |
60 | Source: contrib\bash_completion; DestDir: {app}/Contrib |
|
60 | Source: contrib\bash_completion; DestDir: {app}/Contrib | |
61 | Source: contrib\tcsh_completion; DestDir: {app}/Contrib |
|
61 | Source: contrib\tcsh_completion; DestDir: {app}/Contrib | |
62 | Source: contrib\tcsh_completion_build.sh; DestDir: {app}/Contrib |
|
62 | Source: contrib\tcsh_completion_build.sh; DestDir: {app}/Contrib | |
63 | Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl |
|
63 | Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl | |
64 | Source: contrib\xml.rnc; DestDir: {app}/Contrib |
|
64 | Source: contrib\xml.rnc; DestDir: {app}/Contrib | |
65 | Source: contrib\shrink-revlog.py; DestDir: {app}/Contrib |
|
|||
66 | Source: contrib\mercurial.el; DestDir: {app}/Contrib |
|
65 | Source: contrib\mercurial.el; DestDir: {app}/Contrib | |
67 | Source: contrib\mq.el; DestDir: {app}/Contrib |
|
66 | Source: contrib\mq.el; DestDir: {app}/Contrib | |
68 | Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib |
|
67 | Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib | |
69 | Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib |
|
68 | Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib | |
70 | Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme |
|
69 | Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme | |
71 | Source: contrib\mergetools.hgrc; DestDir: {tmp}; |
|
70 | Source: contrib\mergetools.hgrc; DestDir: {tmp}; | |
72 | Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles; |
|
71 | Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles; | |
73 | Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt |
|
72 | Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt | |
74 | Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local') |
|
73 | Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local') | |
75 | #if ARCH == "x64" |
|
74 | #if ARCH == "x64" | |
76 | Source: dist\*.dll; Destdir: {app} |
|
75 | Source: dist\*.dll; Destdir: {app} | |
77 | Source: dist\*.pyd; Destdir: {app} |
|
76 | Source: dist\*.pyd; Destdir: {app} | |
78 | #else |
|
77 | #else | |
79 | Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist |
|
78 | Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist | |
80 | Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist |
|
79 | Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist | |
81 | Source: dist\w9xpopen.exe; DestDir: {app} |
|
80 | Source: dist\w9xpopen.exe; DestDir: {app} | |
82 | #endif |
|
81 | #endif | |
83 | Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist |
|
82 | Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist | |
84 | Source: dist\library.zip; DestDir: {app} |
|
83 | Source: dist\library.zip; DestDir: {app} | |
85 | Source: dist\add_path.exe; DestDir: {app} |
|
84 | Source: dist\add_path.exe; DestDir: {app} | |
86 | Source: dist\cacert.pem; Destdir: {app} |
|
85 | Source: dist\cacert.pem; Destdir: {app} | |
87 | Source: doc\*.html; DestDir: {app}\Docs |
|
86 | Source: doc\*.html; DestDir: {app}\Docs | |
88 | Source: doc\style.css; DestDir: {app}\Docs |
|
87 | Source: doc\style.css; DestDir: {app}\Docs | |
89 | Source: mercurial\help\*.txt; DestDir: {app}\help |
|
88 | Source: mercurial\help\*.txt; DestDir: {app}\help | |
90 | Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist |
|
89 | Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist | |
91 | Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs |
|
90 | Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs | |
92 | Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt |
|
91 | Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt | |
93 | Source: COPYING; DestDir: {app}; DestName: Copying.txt |
|
92 | Source: COPYING; DestDir: {app}; DestName: Copying.txt | |
94 |
|
93 | |||
95 | [INI] |
|
94 | [INI] | |
96 | Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/ |
|
95 | Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/ | |
97 | Filename: {app}\Mercurial.ini; Section: web; Key: cacerts; String: {app}\cacert.pem |
|
96 | Filename: {app}\Mercurial.ini; Section: web; Key: cacerts; String: {app}\cacert.pem | |
98 |
|
97 | |||
99 | [UninstallDelete] |
|
98 | [UninstallDelete] | |
100 | Type: files; Name: {app}\Mercurial.url |
|
99 | Type: files; Name: {app}\Mercurial.url | |
101 | Type: files; Name: {app}\Contrib\shrink-revlog.pyc |
|
|||
102 |
|
100 | |||
103 | [Icons] |
|
101 | [Icons] | |
104 | Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} |
|
102 | Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} | |
105 | Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html |
|
103 | Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html | |
106 | Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html |
|
104 | Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html | |
107 | Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html |
|
105 | Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html | |
108 | Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url |
|
106 | Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url | |
109 |
|
107 | |||
110 | [Run] |
|
108 | [Run] | |
111 | Filename: "{app}\add_path.exe"; Parameters: "{app}"; Flags: postinstall; Description: "Add the installation path to the search path" |
|
109 | Filename: "{app}\add_path.exe"; Parameters: "{app}"; Flags: postinstall; Description: "Add the installation path to the search path" | |
112 |
|
110 | |||
113 | [UninstallRun] |
|
111 | [UninstallRun] | |
114 | Filename: "{app}\add_path.exe"; Parameters: "/del {app}" |
|
112 | Filename: "{app}\add_path.exe"; Parameters: "/del {app}" | |
115 |
|
113 | |||
116 | [UninstallDelete] |
|
114 | [UninstallDelete] | |
117 | Type: files; Name: "{app}\hg.exe.local" |
|
115 | Type: files; Name: "{app}\hg.exe.local" | |
118 |
|
116 | |||
119 | [Code] |
|
117 | [Code] | |
120 | var |
|
118 | var | |
121 | WriteFile: Boolean; |
|
119 | WriteFile: Boolean; | |
122 | CheckDone: Boolean; |
|
120 | CheckDone: Boolean; | |
123 |
|
121 | |||
124 | function CheckFile(): Boolean; |
|
122 | function CheckFile(): Boolean; | |
125 | begin |
|
123 | begin | |
126 | if not CheckDone then begin |
|
124 | if not CheckDone then begin | |
127 | WriteFile := True; |
|
125 | WriteFile := True; | |
128 | if FileExists(ExpandConstant(CurrentFileName)) then begin |
|
126 | if FileExists(ExpandConstant(CurrentFileName)) then begin | |
129 | WriteFile := MsgBox('' + ExpandConstant(CurrentFileName) + '' #13#13 'The file already exists.' #13#13 'Would you like Setup to overwrite it?', mbConfirmation, MB_YESNO) = idYes; |
|
127 | WriteFile := MsgBox('' + ExpandConstant(CurrentFileName) + '' #13#13 'The file already exists.' #13#13 'Would you like Setup to overwrite it?', mbConfirmation, MB_YESNO) = idYes; | |
130 | end; |
|
128 | end; | |
131 | CheckDone := True; |
|
129 | CheckDone := True; | |
132 | end; |
|
130 | end; | |
133 | Result := WriteFile; |
|
131 | Result := WriteFile; | |
134 | end; |
|
132 | end; | |
135 |
|
133 | |||
136 | procedure ConcatenateFiles(); |
|
134 | procedure ConcatenateFiles(); | |
137 | var |
|
135 | var | |
138 | MergeConfigs: TArrayOfString; |
|
136 | MergeConfigs: TArrayOfString; | |
139 | begin |
|
137 | begin | |
140 | if LoadStringsFromFile(ExpandConstant('{tmp}\mergetools.hgrc'),MergeConfigs) then begin |
|
138 | if LoadStringsFromFile(ExpandConstant('{tmp}\mergetools.hgrc'),MergeConfigs) then begin | |
141 | SaveStringsToFile(ExpandConstant(CurrentFileName),MergeConfigs,True); |
|
139 | SaveStringsToFile(ExpandConstant(CurrentFileName),MergeConfigs,True); | |
142 | end; |
|
140 | end; | |
143 | end; |
|
141 | end; | |
144 |
|
142 | |||
145 | procedure Touch(fn: String); |
|
143 | procedure Touch(fn: String); | |
146 | begin |
|
144 | begin | |
147 | SaveStringToFile(ExpandConstant(fn), '', False); |
|
145 | SaveStringToFile(ExpandConstant(fn), '', False); | |
148 | end; |
|
146 | end; |
General Comments 0
You need to be logged in to leave comments.
Login now