##// END OF EJS Templates
git: make `dirstate.parents()` return a list like the core class...
Matt Harbison -
r52820:e99c0070 default
parent child Browse files
Show More
@@ -125,7 +125,7 class gitdirstate(intdirstate.idirstate)
125
125
126 def parents(self):
126 def parents(self):
127 # TODO how on earth do we find p2 if a merge is in flight?
127 # TODO how on earth do we find p2 if a merge is in flight?
128 return self.p1(), sha1nodeconstants.nullid
128 return [self.p1(), sha1nodeconstants.nullid]
129
129
130 def __iter__(self):
130 def __iter__(self):
131 return (pycompat.fsencode(f.path) for f in self.git.index)
131 return (pycompat.fsencode(f.path) for f in self.git.index)
General Comments 0
You need to be logged in to leave comments. Login now