src/Git/Repository/ConfigEntry.cs @@ -17,7 +17,6 @@ <DefineConstants>DEBUG</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <StartupObject /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> @@ -25,7 +24,6 @@ <OutputPath>bin\Release</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <StartupObject /> </PropertyGroup> <ItemGroup> <Compile Include="Blob.cs" /> src/Git/Core/Core.csproj @@ -76,23 +76,8 @@ namespace Git.Core Array.Copy (header, 0, this.content, 0, header.Length); // Copying the header first Array.Copy (content, 0, this.content, header.Length, content.Length); // then the data - // TODO: remove debugging stuff -// Console.WriteLine ("Length: " + this.content.Length); -// foreach (char c in this.content) { -// if (c == '\n') { -// Console.WriteLine ("\\n"); -// continue; -// } -// if (c == '\0') -// Console.Write ("[NULL]"); -// Console.Write (c); -// } - // initializing the id with the content id = new SHA1 (this.content, true); - - // TODO: remove debugging stuff -// Console.WriteLine ("ID: " + id.ToHexString ()); } /// <summary> @@ -218,7 +203,6 @@ namespace Git.Core // FIXME: I'm getting an error if I don't asign these parameters, this is because // I get out the method before asigned anything to those parameters length = null; - //type = Type.Blob; // Here I get out of the method if (!ParseType (input, ref pos, out type)) src/Git/Core/Object.cs @@ -65,6 +65,7 @@ namespace Git.Core public Revision () { + throw new NotImplementedException (); } } } src/Git/Core/Revision.cs @@ -36,126 +36,40 @@ namespace Git.Repository /// </summary> public class Configuration : IConfiguration { - private string head; - private string description; - private string path; - private string template_path; - private ConfigValue[] values; + string head; + string description; + string path; + string template; + ConfigEntry[] entries; - public string Description - { - set { - description = value; - } - get { - return description; - } - } + public string Head { get; set; } - public string Head - { - set { - head = value; - } - get { - return head; - } - } + public string Description { get; set; } - public string ConfigPath - { - set { - path = value; - } - get { - return path; - } - } + public string Path { get; set; } - public string TemplatePath - { - set { - template_path = value; - } - get { - return template_path; - } - } + public string Template { get; set; } - public ConfigValue[] Values - { - set { - values = value; - } + public ConfigEntry[] Entries { get { - return values; - } - } - - public Configuration () - { - } - - public void AddConfigValues (string configPath) - { - path = configPath; - AddConfigValues (); - } - - public void AddConfigValues () - { - string line = null; - string section = null; - - TextReader tr = new StreamReader (path); - - while ((line = tr.ReadLine()) != null) { - if (line.StartsWith ("[") && line.EndsWith ("]")) { - section = line; - line = tr.ReadLine (); - } - - // TODO: for now we are going to read the value and name as a whole - // the idea is: - // - // Remove all the text after "="(and "=" too) that's the name - // Remove all the text before "="(and "=" too) that's the value - ConfigValue configValue = new ConfigValue (section, line, line); - - AddConfigValue (configValue); + return entries; } - - tr.Close (); - } - - public void AddConfigValue (string configSection, string configName, string configValue) - { - ConfigValue confValue = new ConfigValue (configSection, configName, configValue); - AddConfigValue (confValue); } - public void AddConfigValue (ConfigValue val) + public Configuration (string head, string description, string path, string template) { - if (values == null) { - values = new ConfigValue[0]; - values[0] = val; - } else { - ConfigValue[] tmp = new ConfigValue[values.Length + 1]; - - for (int i = 0; i < values.Length; i++) - tmp[i] = values[i]; - - tmp[tmp.Length - 1] = new ConfigValue(); - tmp[tmp.Length - 1] = val; - values = tmp; - } + // so if we don't pass null we asign it, if we do pass null or empty then we grab the default + this.head = String.IsNullOrEmpty (head) ? GetDefaultHead () : head; + this.description = String.IsNullOrEmpty (description) ? GetDefaultDescription () : description; + this.path = String.IsNullOrEmpty (path) ? GetDefaultConfigDir () : path; + this.template = String.IsNullOrEmpty (template) ? GetDefaultTemplateDir () : template; - //ArrayList valuesArray = new ArrayList (values); + // doing some validations + if (!Directory.Exists (this.path)) + throw new ArgumentException (String.Format ("The provided path ({0}) of the git config doesn't exist", this.path)); - //valuesArray.Add (val); - - //values = (ConfigValue[]) valuesArray.ToArray (); - //values[0] = val; + if (!Directory.Exists (this.template)) + throw new ArgumentException (String.Format ("The provided path ({0}) of the git repo template doesn't exist", this.template)); } // These methods are used to get default configurations from C Git(mostly in UNIX systems) @@ -179,6 +93,5 @@ namespace Git.Repository { return "Unnamed repository; edit this file to name it for gitweb."; } - } } src/Git/Repository/Configuration.cs @@ -27,7 +27,7 @@ </PropertyGroup> <ItemGroup> <Compile Include="Configuration.cs" /> - <Compile Include="ConfigValue.cs" /> + <Compile Include="ConfigEntry.cs" /> <Compile Include="IConfiguration.cs" /> <Compile Include="Ref.cs" /> <Compile Include="Repo.cs" /> src/Git/Repository/Repository.csproj @@ -35,7 +35,7 @@ <Compile Include="TestDiff.cs" /> </ItemGroup> <ItemGroup> - <Folder Include="res/" /> + <Folder Include="res\" /> </ItemGroup> <ItemGroup> <None Include="res\config"> tests/Git/Tests/Tests.csproj src/Git/Repository/ConfigValue.cs 1d28e7dee92af99866997c45c648686fdeaba84d Igor Guerrero Fonseca igfgt1@gmail.com http://github.com/igorgue/git-sharp/commit/a08e80005e0335fceb470a8d5982b5456b82037d a08e80005e0335fceb470a8d5982b5456b82037d 2009-04-17T22:05:20-07:00 2009-04-17T22:05:20-07:00 did some work on the config handler 306eec6751058162280d8404649d437825d18d37 Igor Guerrero Fonseca igfgt1@gmail.com