equal
deleted
inserted
replaced
6 from mercurial import ( |
6 from mercurial import ( |
7 destutil, |
7 destutil, |
8 error, |
8 error, |
9 node, |
9 node, |
10 phases, |
10 phases, |
|
11 pycompat, |
11 obsolete, |
12 obsolete, |
12 util, |
13 util, |
13 ) |
14 ) |
14 from .evolvebits import ( |
15 from .evolvebits import ( |
15 _singlesuccessor, |
16 _singlesuccessor, |
202 return len(self._repo.revs("only(%d, %ld)", dest, minroot)) |
203 return len(self._repo.revs("only(%d, %ld)", dest, minroot)) |
203 except error.NoMergeDestAbort: |
204 except error.NoMergeDestAbort: |
204 return 0 |
205 return 0 |
205 except error.ManyMergeDestAbort as exc: |
206 except error.ManyMergeDestAbort as exc: |
206 # XXX we should make it easier for upstream to provide the information |
207 # XXX we should make it easier for upstream to provide the information |
207 self.behinderror = str(exc).split('-', 1)[0].rstrip() |
208 self.behinderror = pycompat.bytestr(exc).split('-', 1)[0].rstrip() |
208 return -1 |
209 return -1 |
209 return 0 |
210 return 0 |
210 |
211 |
211 @util.propertycache |
212 @util.propertycache |
212 def branches(self): |
213 def branches(self): |