[gitg] Fix status enumerator api breaks
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Fix status enumerator api breaks
- Date: Tue, 28 Jul 2015 21:04:41 +0000 (UTC)
commit f5f45306794047404654681e3ade14cdc782df87
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Jul 28 23:04:26 2015 +0200
Fix status enumerator api breaks
libgitg/gitg-stage-status-enumerator.vala | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/libgitg/gitg-stage-status-enumerator.vala b/libgitg/gitg-stage-status-enumerator.vala
index cdb5b4d..c3e1a52 100644
--- a/libgitg/gitg-stage-status-enumerator.vala
+++ b/libgitg/gitg-stage-status-enumerator.vala
@@ -114,6 +114,7 @@ public class StageStatusFile : Object, StageStatusItem
public class StageStatusSubmodule : Object, StageStatusItem
{
+ private Ggit.Repository d_repository;
private Ggit.Submodule d_submodule;
private string d_path;
private Ggit.SubmoduleStatus d_flags;
@@ -139,15 +140,18 @@ public class StageStatusSubmodule : Object, StageStatusItem
Ggit.SubmoduleStatus.WD_INDEX_MODIFIED
| Ggit.SubmoduleStatus.WD_WD_MODIFIED;
- public StageStatusSubmodule(Ggit.Submodule submodule)
+ public StageStatusSubmodule(Repository repository,
+ Ggit.Submodule submodule)
{
+ d_repository = repository;
d_submodule = submodule;
d_path = submodule.get_path();
try
{
- d_flags = submodule.get_status();
+ d_flags = repository.get_submodule_status(submodule.get_name(),
+ Ggit.SubmoduleIgnore.UNTRACKED);
} catch {}
}
@@ -297,9 +301,7 @@ public class StageStatusEnumerator : Object
if (!d_ignored_submodules.contains(submodule.get_name()))
{
- submodule.set_ignore(Ggit.SubmoduleIgnore.UNTRACKED);
-
- add(new StageStatusSubmodule(submodule));
+ add(new StageStatusSubmodule(d_repository, submodule));
}
return d_cancellable.is_cancelled() ? 1 : 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]