← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to external/ngit/NGit/NGit.Api/StashApplyCommand.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
external/ngit/NGit/NGit.Api/StashApplyCommand.cs
174
174
                        return false;
175
175
                }
176
176
 
177
 
                /// <exception cref="NGit.Api.Errors.JGitInternalException"></exception>
178
177
                /// <exception cref="NGit.Api.Errors.GitAPIException"></exception>
179
178
                private ObjectId GetHeadTree()
180
179
                {
194
193
                        return headTree;
195
194
                }
196
195
 
197
 
                /// <exception cref="NGit.Api.Errors.JGitInternalException"></exception>
198
196
                /// <exception cref="NGit.Api.Errors.GitAPIException"></exception>
199
197
                private ObjectId GetStashId()
200
198
                {
265
263
                                        entry.SetObjectId(stashIndexIter.EntryObjectId);
266
264
                                        DirCacheCheckout.CheckoutEntry(repo, file, entry, treeWalk.ObjectReader);
267
265
                                        DirCacheEntry updatedEntry = entry;
268
 
                                        editor.Add(new _PathEdit_271(updatedEntry, path));
 
266
                                        editor.Add(new _PathEdit_270(updatedEntry, path));
269
267
                                        // Checkout working directory change
270
268
                                        if (!stashWorkingIter.IdEqual(stashIndexIter))
271
269
                                        {
286
284
                        }
287
285
                }
288
286
 
289
 
                private sealed class _PathEdit_271 : DirCacheEditor.PathEdit
 
287
                private sealed class _PathEdit_270 : DirCacheEditor.PathEdit
290
288
                {
291
 
                        public _PathEdit_271(DirCacheEntry updatedEntry, string baseArg1) : base(baseArg1
 
289
                        public _PathEdit_270(DirCacheEntry updatedEntry, string baseArg1) : base(baseArg1
292
290
                                )
293
291
                        {
294
292
                                this.updatedEntry = updatedEntry;
305
303
                /// <summary>Apply the changes in a stashed commit to the working directory and index
306
304
                ///     </summary>
307
305
                /// <returns>id of stashed commit that was applied</returns>
308
 
                /// <exception cref="NGit.Api.Errors.GitAPIException"></exception>
309
 
                /// <exception cref="NGit.Api.Errors.JGitInternalException"></exception>
 
306
                /// <exception cref="NGit.Api.Errors.GitAPIException">NGit.Api.Errors.GitAPIException
 
307
                ///     </exception>
 
308
                /// <exception cref="NGit.Api.Errors.WrongRepositoryStateException">NGit.Api.Errors.WrongRepositoryStateException
 
309
                ///     </exception>
310
310
                public override ObjectId Call()
311
311
                {
312
312
                        CheckCallable();