diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2012-01-18 10:45:56 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2012-01-18 10:45:56 +0400 |
commit | a3e2833df21cbdb59fe9667de0b89fa595d08184 (patch) | |
tree | e6d64e604d82f24123eb6b50c7015130ed5e4f44 /main/src/addins/VersionControl/MonoDevelop.VersionControl.Git | |
parent | f7062e64c292af495006e0b9a9bb654b5c59ce19 (diff) | |
parent | 945e9e89c6d7b992d3309a53f5f4c4b5f81c211e (diff) |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpFoldingParser.cs
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl.Git')
-rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/RepositoryStatus.cs | 72 |
1 files changed, 70 insertions, 2 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/RepositoryStatus.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/RepositoryStatus.cs index 32beb5b029..4aada9f2a3 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/RepositoryStatus.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/RepositoryStatus.cs @@ -50,6 +50,48 @@ using NGit.Treewalk.Filter; namespace MonoDevelop.VersionControl.Git { + class SpecificStatus : NGit.Api.StatusCommand + { + WorkingTreeIterator iter; + IEnumerable<string> Files { + get; set; + } + + public SpecificStatus (NGit.Repository repository) + : base (repository) + { + } + + public SpecificStatus (NGit.Repository repository, IEnumerable<string> files) + : base (repository) + { + Files = files; + } + + public override void SetWorkingTreeIt (WorkingTreeIterator workingTreeIt) + { + iter = workingTreeIt; + } + + public override NGit.Api.Status Call () + { + if (iter == null) + iter = new FileTreeIterator(repo); + + IndexDiff diff = new IndexDiff(repo, Constants.HEAD, iter); + if (Files != null) { + var filters = Files.Select (PathFilter.Create).ToArray (); + if (filters.Length > 1) + diff.SetFilter (OrTreeFilter.Create (filters)); + else + diff.SetFilter (filters [0]); + } + + diff.Diff (); + return new NGit.Api.Status(diff); + } + } + public class RepositoryStatus { private string _root_path; @@ -133,12 +175,38 @@ namespace MonoDevelop.VersionControl.Git MergeConflict = new HashSet<string>(); if (_file_paths != null) - UpdateDirectory (_file_paths, false); + UpdateSingleFiles (_file_paths.ToList ()); else if (_recursive) UpdateDirectory (new string[] { _root_path }, true); else UpdateDirectory (new string[] { _root_path }, false); } + + void UpdateSingleFiles (List<string> singleFiles) + { + var status = new SpecificStatus (Repository, singleFiles).Call (); + + foreach (var v in status.GetAdded ()) + Added.Add (v); + + foreach (var v in status.GetChanged ()) + Modified.Add (v); + + foreach (var v in status.GetConflicting ()) + MergeConflict.Add (v); + + foreach (var v in status.GetMissing ()) + Missing.Add (v); + + foreach (var v in status.GetModified ()) + Modified.Add (v); + + foreach (var v in status.GetRemoved ()) + Removed.Add (v); + + foreach (var v in status.GetUntracked ()) + Untracked.Add (v); + } /// <summary> /// Run the diff operation. Until this is called, all lists will be empty @@ -152,7 +220,7 @@ namespace MonoDevelop.VersionControl.Git TreeWalk treeWalk = new TreeWalk (Repository); treeWalk.Reset (); - treeWalk.Recursive = false; + treeWalk.Recursive = recursive; if (commit != null) treeWalk.AddTree (commit.Tree); |