From b64776e2475d1f33e9d5b3cadbb8c72dca13c34e Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 14 Dec 2019 01:08:31 -0500
Subject: [PATCH] Replace hg config files with git
---
.gitattributes | 13 ++++++
.hgignore => .gitignore | 47 ++++++++------------
.hgeol | 12 -----
indra/tools/manifests/compatibility.manifest | 44 +++++++++---------
4 files changed, 54 insertions(+), 62 deletions(-)
create mode 100644 .gitattributes
rename .hgignore => .gitignore (71%)
mode change 100755 => 100644
delete mode 100644 .hgeol
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..bfbd414682
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+* text eol=lf
+
+*.sln text eol=crlf
+*.vcproj text eol=crlf
+*.vcxproj text eol=crlf
+
+*.gif binary
+*.png binary
+*.tga binary
+*.jpg binary
+*.j2k binary
+
+/indra/tools/manifests/compatibility.manifest text eol=crlf
\ No newline at end of file
diff --git a/.hgignore b/.gitignore
old mode 100755
new mode 100644
similarity index 71%
rename from .hgignore
rename to .gitignore
index 10520a1efb..0d29639ceb
--- a/.hgignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-syntax: glob
-
# WinMerge temp files
*.bak
# Compiled python bytecode
@@ -8,16 +6,19 @@ syntax: glob
.*.swp
#OSX image cache file
*.DS_Store
-#*.orig
+*.orig
+*.cpp.bak
+*.h.bak
+*.diff
+*.old
+*.rej
+
**/.vs
-LICENSES
+
+/build-*
+/clion-*
indra/.distcc
-build-linux-*
-build-darwin-*
-build-vc*
-build-qt*
-build-clion*
-build-*
+
clion-linux*
indra/.idea
indra-build/
@@ -63,23 +64,13 @@ debian/files
build-stamp
configure-stamp
^indra/lib/python/mulib.*
-^web/locale.*
-^web/secondlife.com.*
-^web/config.*
-^indra/web/dataservice/locale.*
-^indra/web/dataservice/lib/shared/vault.*
-^indra/web/dataservice/vendor.*
-glob:indra/newview/dbghelp.dll
-glob:*.cpp.bak
-glob:*.h.bak
-glob:indra/newview/typed_locations.txt
-glob:indra/newview/teleport_history.txt
-glob:indra/newview/search_history.txt
-glob:indra/newview/filters.xml
-glob:indra/newview/avatar_icons_cache.txt
-glob:indra/newview/avatar_lad.log
-glob:*.diff
-glob:*.old
+
+indra/newview/typed_locations.txt
+indra/newview/teleport_history.txt
+indra/newview/search_history.txt
+indra/newview/filters.xml
+indra/newview/avatar_icons_cache.txt
+indra/newview/avatar_lad.log
indra/newview/pilot.txt
indra/newview/pilot.xml
-*.rej
+
diff --git a/.hgeol b/.hgeol
deleted file mode 100644
index 94205bd3ef..0000000000
--- a/.hgeol
+++ /dev/null
@@ -1,12 +0,0 @@
-[repository]
-native = LF
-
-[patterns]
-path:indra/lscript/lscript_compile/windows/unistd.h = CRLF
-path:indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt = CRLF
-path:indra/tools/vstool/README.txt = CRLF
-**.h = native
-**.cpp = native
-**.py = native
-**.xml = native
-**.txt = native
diff --git a/indra/tools/manifests/compatibility.manifest b/indra/tools/manifests/compatibility.manifest
index 419561004c..e0e818f638 100644
--- a/indra/tools/manifests/compatibility.manifest
+++ b/indra/tools/manifests/compatibility.manifest
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- <!-- Windows 10 -->
- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
- <!-- Windows 8.1 -->
- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
- <!-- Windows 8 -->
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
- <!-- Windows 7 -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
- </application>
- </compatibility>
- <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
- <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
- <dpiAware>True/PM</dpiAware>
- </asmv3:windowsSettings>
- <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
- <dpiAwareness>PerMonitorV2, PerMonitor, unaware</dpiAwareness>
- </asmv3:windowsSettings>
- </asmv3:application>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!-- Windows 10 -->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ <!-- Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!-- Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ </application>
+ </compatibility>
+ <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>True/PM</dpiAware>
+ </asmv3:windowsSettings>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+ <dpiAwareness>PerMonitorV2, PerMonitor, unaware</dpiAwareness>
+ </asmv3:windowsSettings>
+ </asmv3:application>
</assembly>
\ No newline at end of file
--
GitLab