equal
deleted
inserted
replaced
11 |
11 |
12 """ |
12 """ |
13 |
13 |
14 |
14 |
15 import collections |
15 import collections |
16 import errno |
|
17 import os |
16 import os |
18 import weakref |
17 import weakref |
19 |
18 |
20 from mercurial.i18n import _ |
19 from mercurial.i18n import _ |
21 from mercurial.node import ( |
20 from mercurial.node import ( |
138 # shared repository support |
137 # shared repository support |
139 def _readsharedfeatures(repo): |
138 def _readsharedfeatures(repo): |
140 """A set of shared features for this repository""" |
139 """A set of shared features for this repository""" |
141 try: |
140 try: |
142 return set(repo.vfs.read(b'shared').splitlines()) |
141 return set(repo.vfs.read(b'shared').splitlines()) |
143 except IOError as inst: |
142 except FileNotFoundError: |
144 if inst.errno != errno.ENOENT: |
|
145 raise |
|
146 return set() |
143 return set() |
147 |
144 |
148 |
145 |
149 def _mergeentriesiter(*iterables, **kwargs): |
146 def _mergeentriesiter(*iterables, **kwargs): |
150 """Given a set of sorted iterables, yield the next entry in merged order |
147 """Given a set of sorted iterables, yield the next entry in merged order |