← 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/MergeCommandResult.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/MergeCommandResult.cs
83
83
                /// </param>
84
84
                /// <param name="mergedCommits">all the commits which have been merged together</param>
85
85
                /// <param name="mergeStatus">the status the merge resulted in</param>
 
86
                /// <param name="mergeStrategy">
 
87
                /// the used
 
88
                /// <see cref="NGit.Merge.MergeStrategy">NGit.Merge.MergeStrategy</see>
 
89
                /// </param>
86
90
                /// <param name="lowLevelResults">
87
91
                /// merge results as returned by
88
92
                /// <see cref="NGit.Merge.ResolveMerger.GetMergeResults()">NGit.Merge.ResolveMerger.GetMergeResults()
89
93
                ///     </see>
90
94
                /// </param>
91
 
                /// <param name="mergeStrategy">
92
 
                /// the used
93
 
                /// <see cref="NGit.Merge.MergeStrategy">NGit.Merge.MergeStrategy</see>
94
 
                /// </param>
 
95
                /// <since>2.0</since>
95
96
                public MergeCommandResult(ObjectId newHead, ObjectId @base, ObjectId[] mergedCommits
96
 
                        , MergeStatus mergeStatus, IDictionary<string, MergeResult<Sequence>> lowLevelResults
97
 
                        , MergeStrategy mergeStrategy) : this(newHead, @base, mergedCommits, mergeStatus
98
 
                        , mergeStrategy, lowLevelResults, null)
 
97
                        , MergeStatus mergeStatus, MergeStrategy mergeStrategy, IDictionary<string, MergeResult
 
98
                        <Sequence>> lowLevelResults) : this(newHead, @base, mergedCommits, mergeStatus, mergeStrategy
 
99
                        , lowLevelResults, null)
99
100
                {
100
101
                }
101
102
 
120
121
                public MergeCommandResult(ObjectId newHead, ObjectId @base, ObjectId[] mergedCommits
121
122
                        , MergeStatus mergeStatus, MergeStrategy mergeStrategy, IDictionary<string, MergeResult
122
123
                        <Sequence>> lowLevelResults, string description) : this(newHead, @base, mergedCommits
123
 
                        , mergeStatus, mergeStrategy, lowLevelResults, null, null)
 
124
                        , mergeStatus, mergeStrategy, lowLevelResults, null, description)
124
125
                {
125
126
                }
126
127
 
352
353
 
353
354
        public abstract class MergeStatus
354
355
        {
355
 
                public static MergeStatus FAST_FORWARD = new FAST_FORWARD_Class();
356
 
 
357
 
                public static MergeStatus ALREADY_UP_TO_DATE = new ALREADY_UP_TO_DATE_Class();
 
356
                public static MergeStatus FAST_FORWARD = new FAST_FORWARD_Class
 
357
                        ();
 
358
 
 
359
                public static MergeStatus FAST_FORWARD_SQUASHED = new FAST_FORWARD_SQUASHED_Class
 
360
                        ();
 
361
 
 
362
                public static MergeStatus ALREADY_UP_TO_DATE = new ALREADY_UP_TO_DATE_Class
 
363
                        ();
358
364
 
359
365
                public static MergeStatus FAILED = new FAILED_Class();
360
366
 
361
367
                public static MergeStatus MERGED = new MERGED_Class();
362
368
 
363
 
                public static MergeStatus CONFLICTING = new CONFLICTING_Class();
364
 
 
365
 
                public static MergeStatus NOT_SUPPORTED = new NOT_SUPPORTED_Class();
 
369
                public static MergeStatus MERGED_SQUASHED = new MERGED_SQUASHED_Class
 
370
                        ();
 
371
 
 
372
                public static MergeStatus CONFLICTING = new CONFLICTING_Class
 
373
                        ();
 
374
 
 
375
                public static MergeStatus NOT_SUPPORTED = new NOT_SUPPORTED_Class
 
376
                        ();
366
377
 
367
378
                internal class FAST_FORWARD_Class : MergeStatus
368
379
                {
377
388
                        }
378
389
                }
379
390
 
 
391
                internal class FAST_FORWARD_SQUASHED_Class : MergeStatus
 
392
                {
 
393
                        public override string ToString()
 
394
                        {
 
395
                                return "Fast-forward-squashed";
 
396
                        }
 
397
 
 
398
                        public override bool IsSuccessful()
 
399
                        {
 
400
                                return true;
 
401
                        }
 
402
                }
 
403
 
380
404
                internal class ALREADY_UP_TO_DATE_Class : MergeStatus
381
405
                {
382
406
                        public override string ToString()
416
440
                        }
417
441
                }
418
442
 
 
443
                internal class MERGED_SQUASHED_Class : MergeStatus
 
444
                {
 
445
                        public override string ToString()
 
446
                        {
 
447
                                return "Merged-squashed";
 
448
                        }
 
449
 
 
450
                        public override bool IsSuccessful()
 
451
                        {
 
452
                                return true;
 
453
                        }
 
454
                }
 
455
 
419
456
                internal class CONFLICTING_Class : MergeStatus
420
457
                {
421
458
                        public override string ToString()