Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

[redakcja.git] / lib / wlrepo / mercurial_backend / revision.py

diff --git a/lib/wlrepo/mercurial_backend/revision.py b/lib/wlrepo/mercurial_backend/revision.py
old mode 100644 (file)
new mode 100755 (executable)
index f05637d..5bb3d0f
--- a/lib/wlrepo/mercurial_backend/revision.py
+++ b/lib/wlrepo/mercurial_backend/revision.py
@@ -99,5 +99,16 @@ class MercurialRevision(wlrepo.Revision):
         finally:
             lock.release()
 
         finally:
             lock.release()
 

+    def parent(self):
+        parents = self._changectx.parents()
+
+        if len(parents) == 1:
+            return self._library._revision(parents[0])
+        
+        if parents[0].branch() == self.hgbranch():
+            return self._library._revision(parents[0])
+        else:
+            return self._library._revision(parents[1]) 
+        

     def __eq__(self, other):
         return self._changectx.node() == other._changectx.node()
     def __eq__(self, other):
         return self._changectx.node() == other._changectx.node()