← Back to branch summary

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

« back to all changes in this revision

Viewing changes to external/ngit/NGit.Test/NGit.Merge/CherryPickTest.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.Test/NGit.Merge/CherryPickTest.cs
71
71
                                DirCacheBuilder o = treeO.Builder();
72
72
                                DirCacheBuilder p = treeP.Builder();
73
73
                                DirCacheBuilder t = treeT.Builder();
74
 
                                b.Add(MakeEntry("a", FileMode.REGULAR_FILE));
75
 
                                o.Add(MakeEntry("a", FileMode.REGULAR_FILE));
76
 
                                o.Add(MakeEntry("o", FileMode.REGULAR_FILE));
77
 
                                p.Add(MakeEntry("a", FileMode.REGULAR_FILE, "q"));
78
 
                                p.Add(MakeEntry("p-fail", FileMode.REGULAR_FILE));
79
 
                                t.Add(MakeEntry("a", FileMode.REGULAR_FILE));
80
 
                                t.Add(MakeEntry("t", FileMode.REGULAR_FILE));
 
74
                                b.Add(CreateEntry("a", FileMode.REGULAR_FILE));
 
75
                                o.Add(CreateEntry("a", FileMode.REGULAR_FILE));
 
76
                                o.Add(CreateEntry("o", FileMode.REGULAR_FILE));
 
77
                                p.Add(CreateEntry("a", FileMode.REGULAR_FILE, "q"));
 
78
                                p.Add(CreateEntry("p-fail", FileMode.REGULAR_FILE));
 
79
                                t.Add(CreateEntry("a", FileMode.REGULAR_FILE));
 
80
                                t.Add(CreateEntry("t", FileMode.REGULAR_FILE));
81
81
                                b.Finish();
82
82
                                o.Finish();
83
83
                                p.Finish();
128
128
                                DirCacheBuilder b = treeB.Builder();
129
129
                                DirCacheBuilder p = treeP.Builder();
130
130
                                DirCacheBuilder t = treeT.Builder();
131
 
                                b.Add(MakeEntry("a", FileMode.REGULAR_FILE));
132
 
                                p.Add(MakeEntry("a", FileMode.REGULAR_FILE, "q"));
133
 
                                p.Add(MakeEntry("p-fail", FileMode.REGULAR_FILE));
134
 
                                t.Add(MakeEntry("a", FileMode.REGULAR_FILE, "q"));
135
 
                                t.Add(MakeEntry("p-fail", FileMode.REGULAR_FILE));
136
 
                                t.Add(MakeEntry("t", FileMode.REGULAR_FILE));
 
131
                                b.Add(CreateEntry("a", FileMode.REGULAR_FILE));
 
132
                                p.Add(CreateEntry("a", FileMode.REGULAR_FILE, "q"));
 
133
                                p.Add(CreateEntry("p-fail", FileMode.REGULAR_FILE));
 
134
                                t.Add(CreateEntry("a", FileMode.REGULAR_FILE, "q"));
 
135
                                t.Add(CreateEntry("p-fail", FileMode.REGULAR_FILE));
 
136
                                t.Add(CreateEntry("t", FileMode.REGULAR_FILE));
137
137
                                b.Finish();
138
138
                                p.Finish();
139
139
                                t.Finish();
178
178
                        odi.Flush();
179
179
                        return id;
180
180
                }
181
 
 
182
 
                /// <exception cref="System.Exception"></exception>
183
 
                private DirCacheEntry MakeEntry(string path, FileMode mode)
184
 
                {
185
 
                        return MakeEntry(path, mode, path);
186
 
                }
187
 
 
188
 
                /// <exception cref="System.Exception"></exception>
189
 
                private DirCacheEntry MakeEntry(string path, FileMode mode, string content)
190
 
                {
191
 
                        DirCacheEntry ent = new DirCacheEntry(path);
192
 
                        ent.FileMode = mode;
193
 
                        ent.SetObjectId(new ObjectInserter.Formatter().IdFor(Constants.OBJ_BLOB, Constants
194
 
                                .Encode(content)));
195
 
                        return ent;
196
 
                }
197
181
        }
198
182
}