@@ -93,12 +93,13 @@ public IObservable<IReadOnlyList<CommitMessage>> GetMessagesForUniqueCommits(
93
93
string compareBranch ,
94
94
int maxCommits )
95
95
{
96
- return Observable . Defer ( ( ) =>
96
+ return Observable . Defer ( async ( ) =>
97
97
{
98
98
// CommitMessage doesn't keep a reference to Repository
99
99
using ( var repo = gitService . GetRepository ( repository . LocalPath ) )
100
100
{
101
- return gitClient . GetMessagesForUniqueCommits ( repo , baseBranch , compareBranch , maxCommits ) . ToObservable ( ) ;
101
+ var messages = await gitClient . GetMessagesForUniqueCommits ( repo , baseBranch , compareBranch , maxCommits ) ;
102
+ return Observable . Return ( messages ) ;
102
103
}
103
104
} ) ;
104
105
}
@@ -130,11 +131,12 @@ static bool IsFilthy(RepositoryStatus status)
130
131
131
132
public IObservable < Unit > Pull ( ILocalRepositoryModel repository )
132
133
{
133
- return Observable . Defer ( ( ) =>
134
+ return Observable . Defer ( async ( ) =>
134
135
{
135
136
using ( var repo = gitService . GetRepository ( repository . LocalPath ) )
136
137
{
137
- return gitClient . Pull ( repo ) . ToObservable ( ) ;
138
+ await gitClient . Pull ( repo ) ;
139
+ return Observable . Return ( Unit . Default ) ;
138
140
}
139
141
} ) ;
140
142
}
@@ -147,7 +149,8 @@ public IObservable<Unit> Push(ILocalRepositoryModel repository)
147
149
{
148
150
var remoteName = repo . Head . RemoteName ;
149
151
var remote = await gitClient . GetHttpRemote ( repo , remoteName ) ;
150
- return gitClient . Push ( repo , repo . Head . TrackedBranch . UpstreamBranchCanonicalName , remote . Name ) . ToObservable ( ) ;
152
+ await gitClient . Push ( repo , repo . Head . TrackedBranch . UpstreamBranchCanonicalName , remote . Name ) ;
153
+ return Observable . Return ( Unit . Default ) ;
151
154
}
152
155
} ) ;
153
156
}
0 commit comments