mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
config: move mergetools configuration from contrib to default configuration
The merge tool configuration is an essential part of a good initial user experience. 'make osx' installers and direct 'make' installation did not have merge tool configuration. Now they have. Note: The installer fixes for windows have been done blindly and might require additional changes.
This commit is contained in:
parent
7f5af5ba4c
commit
79172c85c8
@ -127,7 +127,6 @@ install -m 644 contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir}/
|
||||
install -m 644 contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir}/
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
|
||||
install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -150,7 +149,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%config(noreplace) %{_sysconfdir}/bash_completion.d/mercurial.sh
|
||||
%dir %{_sysconfdir}/mercurial
|
||||
%dir %{_sysconfdir}/mercurial/hgrc.d
|
||||
%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
|
||||
%if "%{?withpython}"
|
||||
%{_bindir}/%{pythonhg}
|
||||
%{hgpyprefix}
|
||||
|
@ -67,7 +67,6 @@ Source: contrib\mq.el; DestDir: {app}/Contrib
|
||||
Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib
|
||||
Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib
|
||||
Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
|
||||
Source: contrib\mergetools.hgrc; DestDir: {tmp};
|
||||
Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles;
|
||||
Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
|
||||
Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
|
||||
@ -86,6 +85,7 @@ Source: dist\cacert.pem; Destdir: {app}
|
||||
Source: doc\*.html; DestDir: {app}\Docs
|
||||
Source: doc\style.css; DestDir: {app}\Docs
|
||||
Source: mercurial\help\*.txt; DestDir: {app}\help
|
||||
Source: mercurial\default-hgrc.d\*.rc; DestDir: {app}\default-hgrc.d
|
||||
Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
|
||||
Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
|
||||
Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
|
||||
|
@ -79,7 +79,7 @@
|
||||
ReadOnly='yes' KeyPath='yes'/>
|
||||
</Component>
|
||||
<Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'>
|
||||
<File Id='mergetools.rc' Name='MergeTools.rc' Source='contrib\mergetools.hgrc'
|
||||
<File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default-hgrc.d\mergetools.rc'
|
||||
ReadOnly='yes' KeyPath='yes'/>
|
||||
</Component>
|
||||
<Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'>
|
||||
|
Loading…
Reference in New Issue
Block a user