development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-08-27 11:59:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unstage_patch by reversing applying patch

Browse source
This commit is contained in:
Jesse van den Kieboom 2014-01-05 20:10:46 +01:00
parent abafcb9cd6
commit 92d891bd4e
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
libgitg/gitg-stage.vala
View file

@ -55,6 +55,39 @@ public class PatchSet
public string filename;
public Patch[] patches;
public PatchSet reversed()
{
var ret = new PatchSet();
ret.filename = filename;
ret.patches = new Patch[patches.length];
for (int i = 0; i < patches.length; i++)
{
var orig = patches[i];
var p = Patch() {
old_offset = orig.new_offset,
new_offset = orig.old_offset,
length = orig.length
};
switch (patches[i].type)
{
case Type.ADD:
p.type = Type.REMOVE;
break;
case Type.REMOVE:
p.type = Type.ADD;
break;
}
ret.patches[i] = p;
}
return ret;
}
}
public class Stage : Object
@ -755,7 +788,9 @@ public class Stage : Object
var head_stream = new MemoryInputStream.from_bytes(new Bytes(head_content));
var index_stream = new MemoryInputStream.from_bytes(new Bytes(index_content));
apply_patch(index, head_stream, index_stream, patch);
var reversed = patch.reversed();
apply_patch(index, index_stream, head_stream, reversed);
head_stream.close();
index_stream.close();