Show More
@@ -65,26 +65,6 b' release = lock.release' | |||
|
65 | 65 | sharedbookmarks = b'bookmarks' |
|
66 | 66 | |
|
67 | 67 | |
|
68 | def _local(path): | |
|
69 | path = util.expandpath(urlutil.urllocalpath(path)) | |
|
70 | ||
|
71 | try: | |
|
72 | # we use os.stat() directly here instead of os.path.isfile() | |
|
73 | # because the latter started returning `False` on invalid path | |
|
74 | # exceptions starting in 3.8 and we care about handling | |
|
75 | # invalid paths specially here. | |
|
76 | st = os.stat(path) | |
|
77 | isfile = stat.S_ISREG(st.st_mode) | |
|
78 | except ValueError as e: | |
|
79 | raise error.Abort( | |
|
80 | _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e)) | |
|
81 | ) | |
|
82 | except OSError: | |
|
83 | isfile = False | |
|
84 | ||
|
85 | return isfile and bundlerepo or localrepo | |
|
86 | ||
|
87 | ||
|
88 | 68 | def addbranchrevs(lrepo, other, branches, revs): |
|
89 | 69 | peer = other.peer() # a courtesy to callers using a localrepo for other |
|
90 | 70 | hashbranch, branches = branches |
@@ -129,10 +109,44 b' def addbranchrevs(lrepo, other, branches' | |||
|
129 | 109 | return revs, revs[0] |
|
130 | 110 | |
|
131 | 111 | |
|
112 | def _isfile(path): | |
|
113 | try: | |
|
114 | # we use os.stat() directly here instead of os.path.isfile() | |
|
115 | # because the latter started returning `False` on invalid path | |
|
116 | # exceptions starting in 3.8 and we care about handling | |
|
117 | # invalid paths specially here. | |
|
118 | st = os.stat(path) | |
|
119 | except ValueError as e: | |
|
120 | msg = stringutil.forcebytestr(e) | |
|
121 | raise error.Abort(_(b'invalid path %s: %s') % (path, msg)) | |
|
122 | except OSError: | |
|
123 | return False | |
|
124 | else: | |
|
125 | return stat.S_ISREG(st.st_mode) | |
|
126 | ||
|
127 | ||
|
128 | class LocalFactory: | |
|
129 | """thin wrapper to dispatch between localrepo and bundle repo""" | |
|
130 | ||
|
131 | @staticmethod | |
|
132 | def islocal(path: bytes) -> bool: | |
|
133 | path = util.expandpath(urlutil.urllocalpath(path)) | |
|
134 | return not _isfile(path) | |
|
135 | ||
|
136 | @staticmethod | |
|
137 | def instance(ui, path, *args, **kwargs): | |
|
138 | path = util.expandpath(urlutil.urllocalpath(path)) | |
|
139 | if _isfile(path): | |
|
140 | cls = bundlerepo | |
|
141 | else: | |
|
142 | cls = localrepo | |
|
143 | return cls.instance(ui, path, *args, **kwargs) | |
|
144 | ||
|
145 | ||
|
132 | 146 | schemes = { |
|
133 | 147 | b'bundle': bundlerepo, |
|
134 | 148 | b'union': unionrepo, |
|
135 |
b'file': |
|
|
149 | b'file': LocalFactory, | |
|
136 | 150 | b'http': httppeer, |
|
137 | 151 | b'https': httppeer, |
|
138 | 152 | b'ssh': sshpeer, |
@@ -144,14 +158,7 b' def _peerlookup(path):' | |||
|
144 | 158 | u = urlutil.url(path) |
|
145 | 159 | scheme = u.scheme or b'file' |
|
146 | 160 | thing = schemes.get(scheme) or schemes[b'file'] |
|
147 | try: | |
|
148 | return thing(path) | |
|
149 | except TypeError: | |
|
150 | # we can't test callable(thing) because 'thing' can be an unloaded | |
|
151 | # module that implements __call__ | |
|
152 | if not util.safehasattr(thing, b'instance'): | |
|
153 | raise | |
|
154 | return thing | |
|
161 | return thing | |
|
155 | 162 | |
|
156 | 163 | |
|
157 | 164 | def islocal(repo): |
General Comments 0
You need to be logged in to leave comments.
Login now