2010-06-20 21:05:11 +00:00
|
|
|
|
// SparkleShare, an instant update workflow to Git.
|
|
|
|
|
// Copyright (C) 2010 Hylke Bons <hylkebons@gmail.com>
|
|
|
|
|
//
|
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
// (at your option) any later version.
|
|
|
|
|
//
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2010-11-21 12:33:24 +00:00
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2010-06-20 21:05:11 +00:00
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
//
|
|
|
|
|
// You should have received a copy of the GNU General Public License
|
2010-07-22 21:10:38 +00:00
|
|
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2010-06-20 21:05:11 +00:00
|
|
|
|
|
2011-02-23 01:13:54 +00:00
|
|
|
|
|
2010-06-20 21:05:11 +00:00
|
|
|
|
using System;
|
2010-09-04 15:23:20 +00:00
|
|
|
|
using System.Collections.Generic;
|
2010-06-20 21:05:11 +00:00
|
|
|
|
using System.Diagnostics;
|
|
|
|
|
using System.IO;
|
|
|
|
|
using System.Text.RegularExpressions;
|
2011-03-08 23:55:21 +00:00
|
|
|
|
|
2010-08-02 15:42:42 +00:00
|
|
|
|
namespace SparkleLib {
|
2010-06-20 21:05:11 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public class SparkleRepoGit : SparkleRepoBase {
|
2011-05-18 18:12:45 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public SparkleRepoGit (string path, SparkleBackend backend) :
|
|
|
|
|
base (path, backend) { }
|
2011-05-18 18:12:45 +00:00
|
|
|
|
|
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override string Url {
|
2011-05-18 18:12:45 +00:00
|
|
|
|
get {
|
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "config --get remote.origin.url");
|
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-05-18 18:12:45 +00:00
|
|
|
|
string output = git.StandardOutput.ReadToEnd ();
|
|
|
|
|
return output.TrimEnd ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-20 21:05:11 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override string Identifier {
|
2011-05-14 17:11:31 +00:00
|
|
|
|
get {
|
|
|
|
|
|
|
|
|
|
// Because git computes a hash based on content,
|
|
|
|
|
// author, and timestamp; it is unique enough to
|
|
|
|
|
// use the hash of the first commit as an identifier
|
|
|
|
|
// for our folder
|
2011-05-17 12:15:44 +00:00
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "rev-list --reverse HEAD");
|
2011-05-14 17:11:31 +00:00
|
|
|
|
git.Start ();
|
2011-05-17 12:15:44 +00:00
|
|
|
|
|
|
|
|
|
// Reading the standard output HAS to go before
|
|
|
|
|
// WaitForExit, or it will hang forever on output > 4096 bytes
|
|
|
|
|
string output = git.StandardOutput.ReadToEnd ();
|
2011-05-14 17:11:31 +00:00
|
|
|
|
git.WaitForExit ();
|
|
|
|
|
|
2011-05-17 12:15:44 +00:00
|
|
|
|
return output.Substring (0, 40);
|
2011-05-14 17:11:31 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override string CurrentRevision {
|
|
|
|
|
get {
|
|
|
|
|
|
|
|
|
|
// Remove stale rebase-apply files because it
|
|
|
|
|
// makes the method return the wrong hashes.
|
|
|
|
|
string rebase_apply_file = SparkleHelpers.CombineMore (LocalPath, ".git", "rebase-apply");
|
|
|
|
|
if (File.Exists (rebase_apply_file))
|
|
|
|
|
File.Delete (rebase_apply_file);
|
|
|
|
|
|
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "log -1 --format=%H");
|
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
|
|
|
|
|
|
|
|
|
if (git.ExitCode == 0) {
|
|
|
|
|
string output = git.StandardOutput.ReadToEnd ();
|
|
|
|
|
return output.TrimEnd ();
|
|
|
|
|
} else {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public override bool CheckForRemoteChanges ()
|
2011-04-20 14:02:20 +00:00
|
|
|
|
{
|
|
|
|
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Checking for remote changes...");
|
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "ls-remote origin master");
|
2010-07-20 21:21:37 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
2011-05-18 18:57:52 +00:00
|
|
|
|
|
|
|
|
|
if (git.ExitCode != 0)
|
2011-05-19 16:05:58 +00:00
|
|
|
|
return false;
|
2011-05-18 18:57:52 +00:00
|
|
|
|
|
|
|
|
|
string remote_revision = git.StandardOutput.ReadToEnd ().TrimEnd ();
|
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
if (!remote_revision.StartsWith (CurrentRevision)) {
|
2011-05-18 18:57:52 +00:00
|
|
|
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Remote changes found. (" + remote_revision + ")");
|
2011-05-19 16:05:58 +00:00
|
|
|
|
return true;
|
|
|
|
|
} else {
|
|
|
|
|
return false;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2011-02-23 00:09:44 +00:00
|
|
|
|
|
2010-07-24 14:03:58 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override bool SyncUp ()
|
2011-04-20 14:02:20 +00:00
|
|
|
|
{
|
2011-05-19 16:05:58 +00:00
|
|
|
|
Add ();
|
2011-04-20 14:02:20 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
string message = FormatCommitMessage ();
|
|
|
|
|
Commit (message);
|
2011-04-20 14:02:20 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "push origin master");
|
2011-04-20 14:02:20 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
2011-04-20 14:02:20 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
if (git.ExitCode == 0) {
|
|
|
|
|
return true;
|
|
|
|
|
} else {
|
|
|
|
|
return false;
|
2011-05-22 14:46:15 +00:00
|
|
|
|
//FetchRebaseAndPush ();TODO
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2010-08-28 18:56:19 +00:00
|
|
|
|
|
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override bool SyncDown ()
|
2011-04-20 14:02:20 +00:00
|
|
|
|
{
|
2011-05-19 16:05:58 +00:00
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "fetch -v origin master");
|
2010-08-28 18:56:19 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
2010-07-20 21:21:37 +00:00
|
|
|
|
|
2011-05-22 14:46:15 +00:00
|
|
|
|
if (git.ExitCode == 0) {
|
2011-05-19 16:05:58 +00:00
|
|
|
|
Rebase ();
|
|
|
|
|
return true;
|
|
|
|
|
} else {
|
|
|
|
|
return false;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2011-04-15 00:28:42 +00:00
|
|
|
|
|
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override bool AnyDifferences {
|
2011-04-20 14:02:20 +00:00
|
|
|
|
get {
|
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "status --porcelain");
|
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
|
|
|
|
|
2011-04-21 13:46:46 +00:00
|
|
|
|
string output = git.StandardOutput.ReadToEnd ().TrimEnd ();
|
|
|
|
|
string [] lines = output.Split ("\n".ToCharArray ());
|
|
|
|
|
|
|
|
|
|
foreach (string line in lines) {
|
2011-04-28 22:32:16 +00:00
|
|
|
|
if (line.Length > 1 && !line [1].Equals (" "))
|
2011-04-21 13:46:46 +00:00
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2010-07-20 21:21:37 +00:00
|
|
|
|
|
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override bool HasUnsyncedChanges {
|
2011-04-21 21:14:44 +00:00
|
|
|
|
get {
|
2011-05-19 16:05:58 +00:00
|
|
|
|
string unsynced_file_path = SparkleHelpers.CombineMore (LocalPath,
|
|
|
|
|
".git", "has_unsynced_changes");
|
|
|
|
|
|
|
|
|
|
return File.Exists (unsynced_file_path);
|
|
|
|
|
}
|
2011-04-21 21:14:44 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
set {
|
|
|
|
|
string unsynced_file_path = SparkleHelpers.CombineMore (LocalPath,
|
|
|
|
|
".git", "has_unsynced_changes");
|
|
|
|
|
|
|
|
|
|
if (value) {
|
|
|
|
|
if (!File.Exists (unsynced_file_path))
|
|
|
|
|
File.Create (unsynced_file_path);
|
|
|
|
|
} else {
|
|
|
|
|
File.Delete (unsynced_file_path);
|
|
|
|
|
}
|
2011-04-21 21:14:44 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
// Stages the made changes
|
|
|
|
|
private void Add ()
|
|
|
|
|
{
|
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "add --all");
|
2011-04-16 23:30:57 +00:00
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
|
|
|
|
|
2011-05-17 19:40:14 +00:00
|
|
|
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes staged");
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
2010-07-22 21:10:38 +00:00
|
|
|
|
|
2010-07-20 21:21:37 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
// Removes unneeded objects
|
|
|
|
|
private void CollectGarbage ()
|
|
|
|
|
{
|
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "gc");
|
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
2010-07-20 21:21:37 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Garbage collected.");
|
|
|
|
|
}
|
2010-08-05 10:40:12 +00:00
|
|
|
|
|
2010-07-20 21:21:37 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
// Commits the made changes
|
2011-05-18 22:18:11 +00:00
|
|
|
|
private void Commit (string message)
|
2011-04-20 14:02:20 +00:00
|
|
|
|
{
|
|
|
|
|
if (!AnyDifferences)
|
|
|
|
|
return;
|
2010-09-11 09:52:10 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "commit -m '" + message + "'");
|
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
2010-07-20 21:21:37 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
SparkleHelpers.DebugInfo ("Commit", "[" + Name + "] " + message);
|
2010-10-07 21:43:08 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
// Collect garbage pseudo-randomly
|
|
|
|
|
if (DateTime.Now.Second % 10 == 0)
|
|
|
|
|
CollectGarbage ();
|
|
|
|
|
}
|
2010-10-07 21:43:08 +00:00
|
|
|
|
|
2011-02-26 14:20:32 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
// Merges the fetched changes
|
2011-05-18 22:18:11 +00:00
|
|
|
|
private void Rebase ()
|
2011-04-20 14:02:20 +00:00
|
|
|
|
{
|
2011-05-18 22:18:11 +00:00
|
|
|
|
DisableWatching ();
|
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
if (AnyDifferences) {
|
|
|
|
|
Add ();
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
string commit_message = FormatCommitMessage ();
|
|
|
|
|
Commit (commit_message);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SparkleGit git = new SparkleGit (LocalPath, "rebase -v FETCH_HEAD");
|
|
|
|
|
|
2011-05-18 18:57:52 +00:00
|
|
|
|
git.Start ();
|
|
|
|
|
git.WaitForExit ();
|
2010-07-20 21:21:37 +00:00
|
|
|
|
|
2011-05-18 18:57:52 +00:00
|
|
|
|
if (git.ExitCode != 0) {
|
|
|
|
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out...");
|
|
|
|
|
DisableWatching ();
|
2011-02-26 14:20:32 +00:00
|
|
|
|
|
2011-05-22 15:29:23 +00:00
|
|
|
|
while (AnyDifferences)
|
2011-05-18 18:57:52 +00:00
|
|
|
|
ResolveConflict ();
|
2011-05-14 02:18:38 +00:00
|
|
|
|
|
2011-05-18 18:57:52 +00:00
|
|
|
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
|
|
|
|
|
EnableWatching ();
|
2010-06-20 21:05:11 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
OnConflictResolved ();
|
2011-05-22 15:27:06 +00:00
|
|
|
|
SyncUp ();
|
2011-05-18 18:57:52 +00:00
|
|
|
|
}
|
2011-03-03 12:08:50 +00:00
|
|
|
|
|
2011-05-18 22:18:11 +00:00
|
|
|
|
EnableWatching ();
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
2010-06-20 21:05:11 +00:00
|
|
|
|
|
2010-07-21 23:17:20 +00:00
|
|
|
|
|
2011-04-28 11:49:14 +00:00
|
|
|
|
private void ResolveConflict ()
|
|
|
|
|
{
|
2011-04-30 00:42:48 +00:00
|
|
|
|
// This is al list of conflict status codes that Git uses, their
|
|
|
|
|
// meaning, and how SparkleShare should handle them.
|
|
|
|
|
//
|
|
|
|
|
// DD unmerged, both deleted -> Do nothing
|
|
|
|
|
// AU unmerged, added by us -> Use theirs, save ours as a timestamped copy
|
|
|
|
|
// UD unmerged, deleted by them -> Use ours
|
|
|
|
|
// UA unmerged, added by them -> Use theirs, save ours as a timestamped copy
|
|
|
|
|
// DU unmerged, deleted by us -> Use theirs
|
|
|
|
|
// AA unmerged, both added -> Use theirs, save ours as a timestamped copy
|
|
|
|
|
// UU unmerged, both modified -> Use theirs, save ours as a timestamped copy
|
|
|
|
|
//
|
|
|
|
|
// Note that a rebase merge works by replaying each commit from the working branch on
|
|
|
|
|
// top of the upstream branch. Because of this, when a merge conflict happens the
|
|
|
|
|
// side reported as 'ours' is the so-far rebased series, starting with upstream,
|
|
|
|
|
// and 'theirs' is the working branch. In other words, the sides are swapped.
|
|
|
|
|
//
|
|
|
|
|
// So: 'ours' means the 'server's version' and 'theirs' means the 'local version'
|
|
|
|
|
|
2011-04-28 11:49:14 +00:00
|
|
|
|
SparkleGit git_status = new SparkleGit (LocalPath, "status --porcelain");
|
|
|
|
|
git_status.Start ();
|
|
|
|
|
git_status.WaitForExit ();
|
|
|
|
|
|
2011-04-30 00:42:48 +00:00
|
|
|
|
string output = git_status.StandardOutput.ReadToEnd ().TrimEnd ();
|
2011-04-28 11:49:14 +00:00
|
|
|
|
string [] lines = output.Split ("\n".ToCharArray ());
|
|
|
|
|
|
|
|
|
|
foreach (string line in lines) {
|
2011-04-30 00:42:48 +00:00
|
|
|
|
string conflicting_path = line.Substring (3);
|
|
|
|
|
conflicting_path = conflicting_path.Trim ("\"".ToCharArray ());
|
|
|
|
|
|
2011-05-06 10:31:30 +00:00
|
|
|
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict type: " + line);
|
|
|
|
|
|
2011-04-30 00:42:48 +00:00
|
|
|
|
// Both the local and server version have been modified
|
|
|
|
|
if (line.StartsWith ("UU") || line.StartsWith ("AA") ||
|
|
|
|
|
line.StartsWith ("AU") || line.StartsWith ("UA")) {
|
|
|
|
|
|
|
|
|
|
// Recover local version
|
|
|
|
|
SparkleGit git_theirs = new SparkleGit (LocalPath,
|
|
|
|
|
"checkout --theirs \"" + conflicting_path + "\"");
|
|
|
|
|
git_theirs.Start ();
|
|
|
|
|
git_theirs.WaitForExit ();
|
2011-04-28 11:49:14 +00:00
|
|
|
|
|
2011-04-30 00:42:48 +00:00
|
|
|
|
// Append a timestamp to local version
|
|
|
|
|
string timestamp = DateTime.Now.ToString ("HH:mm MMM d");
|
2011-05-20 00:55:49 +00:00
|
|
|
|
string their_path = conflicting_path + " (" + UserName + ", " + timestamp + ")";
|
2011-04-30 00:42:48 +00:00
|
|
|
|
string abs_conflicting_path = Path.Combine (LocalPath, conflicting_path);
|
|
|
|
|
string abs_their_path = Path.Combine (LocalPath, their_path);
|
2011-04-28 11:49:14 +00:00
|
|
|
|
|
2011-04-30 00:42:48 +00:00
|
|
|
|
File.Move (abs_conflicting_path, abs_their_path);
|
|
|
|
|
|
|
|
|
|
// Recover server version
|
2011-04-28 11:49:14 +00:00
|
|
|
|
SparkleGit git_ours = new SparkleGit (LocalPath,
|
2011-04-30 00:42:48 +00:00
|
|
|
|
"checkout --ours \"" + conflicting_path + "\"");
|
2011-04-28 11:49:14 +00:00
|
|
|
|
git_ours.Start ();
|
|
|
|
|
git_ours.WaitForExit ();
|
|
|
|
|
|
2011-04-30 00:42:48 +00:00
|
|
|
|
Add ();
|
2011-04-28 11:49:14 +00:00
|
|
|
|
|
2011-04-30 00:42:48 +00:00
|
|
|
|
SparkleGit git_rebase_continue = new SparkleGit (LocalPath, "rebase --continue");
|
|
|
|
|
git_rebase_continue.Start ();
|
|
|
|
|
git_rebase_continue.WaitForExit ();
|
|
|
|
|
}
|
2011-04-28 22:32:16 +00:00
|
|
|
|
|
2011-04-30 00:42:48 +00:00
|
|
|
|
// The local version has been modified, but the server version was removed
|
|
|
|
|
if (line.StartsWith ("DU")) {
|
|
|
|
|
|
|
|
|
|
// The modified local version is already in the
|
|
|
|
|
// checkout, so it just needs to be added.
|
|
|
|
|
//
|
|
|
|
|
// We need to specifically mention the file, so
|
|
|
|
|
// we can't reuse the Add () method
|
|
|
|
|
SparkleGit git_add = new SparkleGit (LocalPath,
|
|
|
|
|
"add " + conflicting_path);
|
|
|
|
|
git_add.Start ();
|
|
|
|
|
git_add.WaitForExit ();
|
|
|
|
|
|
|
|
|
|
SparkleGit git_rebase_continue = new SparkleGit (LocalPath, "rebase --continue");
|
|
|
|
|
git_rebase_continue.Start ();
|
|
|
|
|
git_rebase_continue.WaitForExit ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// The server version has been modified, but the local version was removed
|
|
|
|
|
if (line.StartsWith ("UD")) {
|
|
|
|
|
|
|
|
|
|
// We can just skip here, the server version is
|
|
|
|
|
// already in the checkout
|
|
|
|
|
SparkleGit git_rebase_skip = new SparkleGit (LocalPath, "rebase --skip");
|
|
|
|
|
git_rebase_skip.Start ();
|
|
|
|
|
git_rebase_skip.WaitForExit ();
|
2011-04-28 11:49:14 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-05-18 18:12:45 +00:00
|
|
|
|
// Returns a list of the latest change sets
|
2011-04-20 14:02:20 +00:00
|
|
|
|
// TODO: Method needs to be made a lot faster
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override List <SparkleChangeSet> GetChangeSets (int count)
|
2011-04-20 14:02:20 +00:00
|
|
|
|
{
|
|
|
|
|
if (count < 1)
|
|
|
|
|
count = 30;
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-05-16 23:49:01 +00:00
|
|
|
|
List <SparkleChangeSet> change_sets = new List <SparkleChangeSet> ();
|
2011-04-20 14:02:20 +00:00
|
|
|
|
|
2011-04-28 11:46:22 +00:00
|
|
|
|
SparkleGit git_log = new SparkleGit (LocalPath, "log -" + count + " --raw -M --date=iso");
|
2011-04-21 17:45:11 +00:00
|
|
|
|
Console.OutputEncoding = System.Text.Encoding.Unicode;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
git_log.Start ();
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
// Reading the standard output HAS to go before
|
|
|
|
|
// WaitForExit, or it will hang forever on output > 4096 bytes
|
|
|
|
|
string output = git_log.StandardOutput.ReadToEnd ();
|
|
|
|
|
git_log.WaitForExit ();
|
|
|
|
|
|
|
|
|
|
string [] lines = output.Split ("\n".ToCharArray ());
|
|
|
|
|
List <string> entries = new List <string> ();
|
|
|
|
|
|
|
|
|
|
int j = 0;
|
|
|
|
|
string entry = "", last_entry = "";
|
|
|
|
|
foreach (string line in lines) {
|
|
|
|
|
if (line.StartsWith ("commit") && j > 0) {
|
|
|
|
|
entries.Add (entry);
|
|
|
|
|
entry = "";
|
2011-05-19 16:05:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
entry += line + "\n";
|
|
|
|
|
j++;
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
last_entry = entry;
|
|
|
|
|
}
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
entries.Add (last_entry);
|
|
|
|
|
|
2011-05-04 23:07:02 +00:00
|
|
|
|
Regex merge_regex = new Regex (@"commit ([a-z0-9]{40})\n" +
|
2011-05-03 17:13:02 +00:00
|
|
|
|
"Merge: .+ .+\n" +
|
|
|
|
|
"Author: (.+) <(.+)>\n" +
|
|
|
|
|
"Date: ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
|
|
|
|
|
"([0-9]{2}):([0-9]{2}):([0-9]{2}) .([0-9]{4})\n" +
|
|
|
|
|
"*", RegexOptions.Compiled);
|
|
|
|
|
|
2011-05-04 23:07:02 +00:00
|
|
|
|
Regex non_merge_regex = new Regex (@"commit ([a-z0-9]{40})\n" +
|
2011-05-03 17:13:02 +00:00
|
|
|
|
"Author: (.+) <(.+)>\n" +
|
|
|
|
|
"Date: ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
|
|
|
|
|
"([0-9]{2}):([0-9]{2}):([0-9]{2}) .([0-9]{4})\n" +
|
|
|
|
|
"*", RegexOptions.Compiled);
|
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
// TODO: Need to optimise for speed
|
|
|
|
|
foreach (string log_entry in entries) {
|
|
|
|
|
Regex regex;
|
|
|
|
|
bool is_merge_commit = false;
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
if (log_entry.Contains ("\nMerge: ")) {
|
2011-05-03 17:13:02 +00:00
|
|
|
|
regex = merge_regex;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
is_merge_commit = true;
|
|
|
|
|
} else {
|
2011-05-03 17:13:02 +00:00
|
|
|
|
regex = non_merge_regex;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
Match match = regex.Match (log_entry);
|
|
|
|
|
|
|
|
|
|
if (match.Success) {
|
2011-05-16 23:49:01 +00:00
|
|
|
|
SparkleChangeSet change_set = new SparkleChangeSet ();
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-05-17 12:15:44 +00:00
|
|
|
|
change_set.Revision = match.Groups [1].Value;
|
2011-05-16 23:49:01 +00:00
|
|
|
|
change_set.UserName = match.Groups [2].Value;
|
|
|
|
|
change_set.UserEmail = match.Groups [3].Value;
|
|
|
|
|
change_set.IsMerge = is_merge_commit;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
|
2011-05-16 23:59:03 +00:00
|
|
|
|
change_set.Timestamp = new DateTime (int.Parse (match.Groups [4].Value),
|
2011-04-20 14:02:20 +00:00
|
|
|
|
int.Parse (match.Groups [5].Value), int.Parse (match.Groups [6].Value),
|
|
|
|
|
int.Parse (match.Groups [7].Value), int.Parse (match.Groups [8].Value),
|
|
|
|
|
int.Parse (match.Groups [9].Value));
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
string [] entry_lines = log_entry.Split ("\n".ToCharArray ());
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
foreach (string entry_line in entry_lines) {
|
|
|
|
|
if (entry_line.StartsWith (":")) {
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
string change_type = entry_line [37].ToString ();
|
|
|
|
|
string file_path = entry_line.Substring (39);
|
2011-04-28 11:46:22 +00:00
|
|
|
|
string to_file_path;
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
if (change_type.Equals ("A")) {
|
2011-05-16 23:49:01 +00:00
|
|
|
|
change_set.Added.Add (file_path);
|
2011-04-20 14:02:20 +00:00
|
|
|
|
} else if (change_type.Equals ("M")) {
|
2011-05-16 23:49:01 +00:00
|
|
|
|
change_set.Edited.Add (file_path);
|
2011-04-20 14:02:20 +00:00
|
|
|
|
} else if (change_type.Equals ("D")) {
|
2011-05-16 23:49:01 +00:00
|
|
|
|
change_set.Deleted.Add (file_path);
|
2011-04-28 11:46:22 +00:00
|
|
|
|
} else if (change_type.Equals ("R")) {
|
|
|
|
|
int tab_pos = entry_line.LastIndexOf ("\t");
|
|
|
|
|
file_path = entry_line.Substring (42, tab_pos - 42);
|
|
|
|
|
to_file_path = entry_line.Substring (tab_pos + 1);
|
|
|
|
|
|
2011-05-16 23:49:01 +00:00
|
|
|
|
change_set.MovedFrom.Add (file_path);
|
|
|
|
|
change_set.MovedTo.Add (to_file_path);
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-05-19 16:05:58 +00:00
|
|
|
|
|
2011-05-16 23:49:01 +00:00
|
|
|
|
change_sets.Add (change_set);
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2010-08-08 19:16:48 +00:00
|
|
|
|
|
2011-05-16 23:49:01 +00:00
|
|
|
|
return change_sets;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
2010-08-29 10:38:34 +00:00
|
|
|
|
|
2010-06-20 21:05:11 +00:00
|
|
|
|
|
2011-04-20 14:02:20 +00:00
|
|
|
|
// Creates a pretty commit message based on what has changed
|
|
|
|
|
private string FormatCommitMessage ()
|
|
|
|
|
{
|
2011-04-27 16:44:59 +00:00
|
|
|
|
List<string> Added = new List<string> ();
|
|
|
|
|
List<string> Modified = new List<string> ();
|
|
|
|
|
List<string> Removed = new List<string> ();
|
2011-04-21 12:25:28 +00:00
|
|
|
|
string file_name = "";
|
2011-05-17 12:15:44 +00:00
|
|
|
|
string message = "";
|
2011-04-21 12:25:28 +00:00
|
|
|
|
|
|
|
|
|
SparkleGit git_status = new SparkleGit (LocalPath, "status --porcelain");
|
|
|
|
|
git_status.Start ();
|
|
|
|
|
|
|
|
|
|
// Reading the standard output HAS to go before
|
|
|
|
|
// WaitForExit, or it will hang forever on output > 4096 bytes
|
2011-04-21 13:46:46 +00:00
|
|
|
|
string output = git_status.StandardOutput.ReadToEnd ().Trim ("\n".ToCharArray ());
|
2011-04-21 12:25:28 +00:00
|
|
|
|
git_status.WaitForExit ();
|
|
|
|
|
|
|
|
|
|
string [] lines = output.Split ("\n".ToCharArray ());
|
|
|
|
|
foreach (string line in lines) {
|
|
|
|
|
if (line.StartsWith ("A"))
|
2011-05-17 19:40:14 +00:00
|
|
|
|
Added.Add (line.Substring (3));
|
2011-04-21 12:25:28 +00:00
|
|
|
|
else if (line.StartsWith ("M"))
|
2011-05-17 19:40:14 +00:00
|
|
|
|
Modified.Add (line.Substring (3));
|
2011-04-21 12:25:28 +00:00
|
|
|
|
else if (line.StartsWith ("D"))
|
2011-05-17 19:40:14 +00:00
|
|
|
|
Removed.Add (line.Substring (3));
|
2011-04-27 10:04:51 +00:00
|
|
|
|
else if (line.StartsWith ("R")) {
|
|
|
|
|
Removed.Add (line.Substring (3, (line.IndexOf (" -> ") - 3)));
|
|
|
|
|
Added.Add (line.Substring (line.IndexOf (" -> ") + 4));
|
|
|
|
|
}
|
2011-04-21 12:25:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-05-17 21:37:22 +00:00
|
|
|
|
int count = 0;
|
|
|
|
|
int max_count = 20;
|
|
|
|
|
|
|
|
|
|
string n = Environment.NewLine;
|
|
|
|
|
|
2011-05-18 13:03:50 +00:00
|
|
|
|
foreach (string added in Added) {
|
|
|
|
|
file_name = added.Trim ("\"".ToCharArray ());
|
|
|
|
|
message += "+ ‘" + file_name + "’" + n;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
|
2011-05-18 13:03:50 +00:00
|
|
|
|
count++;
|
|
|
|
|
if (count == max_count)
|
|
|
|
|
return message + "...";
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-05-18 13:03:50 +00:00
|
|
|
|
foreach (string modified in Modified) {
|
|
|
|
|
file_name = modified.Trim ("\"".ToCharArray ());
|
|
|
|
|
message += "/ ‘" + file_name + "’" + n;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
|
2011-05-18 13:03:50 +00:00
|
|
|
|
count++;
|
|
|
|
|
if (count == max_count)
|
|
|
|
|
return message + "...";
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-05-18 13:03:50 +00:00
|
|
|
|
foreach (string removed in Removed) {
|
|
|
|
|
file_name = removed.Trim ("\"".ToCharArray ());
|
|
|
|
|
message += "- ‘" + file_name + "’" + n;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
|
2011-05-18 13:03:50 +00:00
|
|
|
|
count++;
|
|
|
|
|
if (count == max_count)
|
|
|
|
|
return message + "..." + n;
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-05-18 18:57:52 +00:00
|
|
|
|
return message.TrimEnd ();
|
2011-04-20 14:02:20 +00:00
|
|
|
|
}
|
2010-06-20 21:05:11 +00:00
|
|
|
|
|
2010-10-10 22:04:08 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override void CreateInitialChangeSet ()
|
|
|
|
|
{
|
|
|
|
|
base.CreateInitialChangeSet ();
|
|
|
|
|
Add ();
|
|
|
|
|
|
|
|
|
|
string message = FormatCommitMessage ();
|
|
|
|
|
Commit (message);
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-22 11:28:14 +00:00
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
new public static bool IsRepo (string path)
|
2011-03-22 13:44:52 +00:00
|
|
|
|
{
|
2011-03-12 18:36:03 +00:00
|
|
|
|
return System.IO.Directory.Exists (Path.Combine (path, ".git"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-05-19 16:05:58 +00:00
|
|
|
|
public override bool UsesNotificationCenter
|
2011-03-22 13:44:52 +00:00
|
|
|
|
{
|
2011-04-20 14:02:20 +00:00
|
|
|
|
get {
|
|
|
|
|
string file_path = SparkleHelpers.CombineMore (LocalPath, ".git", "disable_notification_center");
|
|
|
|
|
return !File.Exists (file_path);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-07-24 12:32:05 +00:00
|
|
|
|
}
|