fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes to pull/push logic.
[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
..
80b761f
--- a/
lib/wlrepo/mercurial_backend/revision.py
+++ b/
lib/wlrepo/mercurial_backend/revision.py
@@
-99,5
+99,13
@@
class MercurialRevision(wlrepo.Revision):
finally:
lock.release()
finally:
lock.release()
+ def parent(self):
+ parents = self._changectx.parents()
+
+ if len(parents) == 1:
+ return parents[0]
+
+ return parents[0] if (parents[0].branch() == self.branch()) else parents[1]
+
def __eq__(self, other):
return self._changectx.node() == other._changectx.node()
def __eq__(self, other):
return self._changectx.node() == other._changectx.node()