Mercurial > hg
annotate hgext/largefiles/proto.py @ 35455:02ea370c2baa
split: new extension to split changesets
This diff introduces an experimental split extension to split changesets.
The implementation is largely inspired by Laurent Charignon's implementation
for mutable-history (changeset 9603aa1ecdfd54b0d86e262318a72e0a2ffeb6cc [1])
This version contains various improvements:
- Rebase by default.
This is more friendly for new users. Split won't lead to merge conflicts
so a rebase won't give the user more trouble.
This has been on by default at Facebook for months now and seems to be a
good UX improvement.
The rebase skips obsoleted or orphaned changesets, which can avoid
issues like allowdivergence, merge conflicts, etc. This is more flexible
because the user can decide what to do next (see the last test case in
test-split.t)
- Remove "Done split? [y/n]" prompt.
That could be detected by checking `repo.status()` instead.
- Works with obsstore disabled.
Without obsstore, split uses strip to clean up old nodes, and it can
even handle split a non-head changeset with "allowunstable" disabled,
since it runs a rebase to solve the "unstable" issue in a same
transaction.
- More friendly editor text.
Put what has been already split into the editor text so users won't lost
track about where they are.
[1]: https://bitbucket.org/marmoute/mutable-history/commits/9603aa1ecdfd54b
Differential Revision: https://phab.mercurial-scm.org/D1082
author | Jun Wu <quark@fb.com> |
---|---|
date | Sat, 24 Jun 2017 23:03:41 -0700 |
parents | 576ba8194fa8 |
children | 95a9be56c3bb |
rev | line source |
---|---|
15168 | 1 # Copyright 2011 Fog Creek Software |
2 # | |
3 # This software may be used and distributed according to the terms of the | |
4 # GNU General Public License version 2 or any later version. | |
29312
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
5 from __future__ import absolute_import |
15168 | 6 |
7 import os | |
19917
cff331cbb5ee
largefiles: make the protocol hack for replacing heads with lheads more precise
Mads Kiilerich <madski@unity3d.com>
parents:
19009
diff
changeset
|
8 import re |
15168 | 9 |
10 from mercurial.i18n import _ | |
11 | |
29312
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
12 from mercurial import ( |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
13 error, |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
14 httppeer, |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
15 util, |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
16 wireproto, |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
17 ) |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
18 |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
19 from . import ( |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
20 lfutil, |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
21 ) |
29139be0ccc7
py3: make largefiles/proto.py use absolute_import
liscju <piotr.listkiewicz@gmail.com>
parents:
28883
diff
changeset
|
22 |
28883
032c4c2f802a
pycompat: switch to util.urlreq/util.urlerr for py3 compat
timeless <timeless@mozdev.org>
parents:
28576
diff
changeset
|
23 urlerr = util.urlerr |
032c4c2f802a
pycompat: switch to util.urlreq/util.urlerr for py3 compat
timeless <timeless@mozdev.org>
parents:
28576
diff
changeset
|
24 urlreq = util.urlreq |
032c4c2f802a
pycompat: switch to util.urlreq/util.urlerr for py3 compat
timeless <timeless@mozdev.org>
parents:
28576
diff
changeset
|
25 |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
26 LARGEFILES_REQUIRED_MSG = ('\nThis repository uses the largefiles extension.' |
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
27 '\n\nPlease enable it in your Mercurial config ' |
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
28 'file.\n') |
15168 | 29 |
18922
d2c4d37f7db5
largefiles: quiet (and document) undefined name errors (issue3886)
Bryan O'Sullivan <bryano@fb.com>
parents:
18488
diff
changeset
|
30 # these will all be replaced by largefiles.uisetup |
d2c4d37f7db5
largefiles: quiet (and document) undefined name errors (issue3886)
Bryan O'Sullivan <bryano@fb.com>
parents:
18488
diff
changeset
|
31 capabilitiesorig = None |
d2c4d37f7db5
largefiles: quiet (and document) undefined name errors (issue3886)
Bryan O'Sullivan <bryano@fb.com>
parents:
18488
diff
changeset
|
32 ssholdcallstream = None |
d2c4d37f7db5
largefiles: quiet (and document) undefined name errors (issue3886)
Bryan O'Sullivan <bryano@fb.com>
parents:
18488
diff
changeset
|
33 httpoldcallstream = None |
d2c4d37f7db5
largefiles: quiet (and document) undefined name errors (issue3886)
Bryan O'Sullivan <bryano@fb.com>
parents:
18488
diff
changeset
|
34 |
15168 | 35 def putlfile(repo, proto, sha): |
28576
33bd95443e7f
largefiles: add some docstrings
Mads Kiilerich <madski@unity3d.com>
parents:
26825
diff
changeset
|
36 '''Server command for putting a largefile into a repository's local store |
33bd95443e7f
largefiles: add some docstrings
Mads Kiilerich <madski@unity3d.com>
parents:
26825
diff
changeset
|
37 and into the user cache.''' |
15168 | 38 proto.redirect() |
15391
a5a6a9b7f3b9
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp
Hao Lian <hao@fogcreek.com>
parents:
15317
diff
changeset
|
39 |
16594
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16247
diff
changeset
|
40 path = lfutil.storepath(repo, sha) |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16247
diff
changeset
|
41 util.makedirs(os.path.dirname(path)) |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16247
diff
changeset
|
42 tmpfp = util.atomictempfile(path, createmode=repo.store.createmode) |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16247
diff
changeset
|
43 |
15168 | 44 try: |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
21084
diff
changeset
|
45 proto.getfile(tmpfp) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
21084
diff
changeset
|
46 tmpfp._fp.seek(0) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
21084
diff
changeset
|
47 if sha != lfutil.hexsha1(tmpfp._fp): |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
21084
diff
changeset
|
48 raise IOError(0, _('largefile contents do not match hash')) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
21084
diff
changeset
|
49 tmpfp.close() |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
21084
diff
changeset
|
50 lfutil.linktousercache(repo, sha) |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25079
diff
changeset
|
51 except IOError as e: |
25079
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
21084
diff
changeset
|
52 repo.ui.warn(_('largefiles: failed to put %s into store: %s\n') % |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
21084
diff
changeset
|
53 (sha, e.strerror)) |
bee00e0c2e45
largefiles: use try/except/finally
Matt Mackall <mpm@selenic.com>
parents:
21084
diff
changeset
|
54 return wireproto.pushres(1) |
15168 | 55 finally: |
16155
1b2b42e866be
largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents:
15778
diff
changeset
|
56 tmpfp.discard() |
15168 | 57 |
58 return wireproto.pushres(0) | |
59 | |
60 def getlfile(repo, proto, sha): | |
28576
33bd95443e7f
largefiles: add some docstrings
Mads Kiilerich <madski@unity3d.com>
parents:
26825
diff
changeset
|
61 '''Server command for retrieving a largefile from the repository-local |
33bd95443e7f
largefiles: add some docstrings
Mads Kiilerich <madski@unity3d.com>
parents:
26825
diff
changeset
|
62 cache or user cache.''' |
15168 | 63 filename = lfutil.findfile(repo, sha) |
64 if not filename: | |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25660
diff
changeset
|
65 raise error.Abort(_('requested largefile %s not present in cache') |
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25660
diff
changeset
|
66 % sha) |
15168 | 67 f = open(filename, 'rb') |
68 length = os.fstat(f.fileno())[6] | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
69 |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
70 # Since we can't set an HTTP content-length header here, and |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
71 # Mercurial core provides no way to give the length of a streamres |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
72 # (and reading the entire file into RAM would be ill-advised), we |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
73 # just send the length on the first line of the response, like the |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
74 # ssh proto does for string responses. |
15168 | 75 def generator(): |
76 yield '%d\n' % length | |
19009
07e40d589b64
largefiles: use filechunkiter for iterating largefile when serving getlfile
Mads Kiilerich <madski@unity3d.com>
parents:
19006
diff
changeset
|
77 for chunk in util.filechunkiter(f): |
15168 | 78 yield chunk |
30466
2add671bf55b
wireproto: perform chunking and compression at protocol layer (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30181
diff
changeset
|
79 return wireproto.streamres(gen=generator()) |
15168 | 80 |
81 def statlfile(repo, proto, sha): | |
28576
33bd95443e7f
largefiles: add some docstrings
Mads Kiilerich <madski@unity3d.com>
parents:
26825
diff
changeset
|
82 '''Server command for checking if a largefile is present - returns '2\n' if |
33bd95443e7f
largefiles: add some docstrings
Mads Kiilerich <madski@unity3d.com>
parents:
26825
diff
changeset
|
83 the largefile is missing, '0\n' if it seems to be in good condition. |
18488
a977b42df8b3
largefiles: don't verify largefile hashes on servers when processing statlfile
Mads Kiilerich <madski@unity3d.com>
parents:
18298
diff
changeset
|
84 |
a977b42df8b3
largefiles: don't verify largefile hashes on servers when processing statlfile
Mads Kiilerich <madski@unity3d.com>
parents:
18298
diff
changeset
|
85 The value 1 is reserved for mismatched checksum, but that is too expensive |
a977b42df8b3
largefiles: don't verify largefile hashes on servers when processing statlfile
Mads Kiilerich <madski@unity3d.com>
parents:
18298
diff
changeset
|
86 to be verified on every stat and must be caught be running 'hg verify' |
a977b42df8b3
largefiles: don't verify largefile hashes on servers when processing statlfile
Mads Kiilerich <madski@unity3d.com>
parents:
18298
diff
changeset
|
87 server side.''' |
15168 | 88 filename = lfutil.findfile(repo, sha) |
89 if not filename: | |
90 return '2\n' | |
18488
a977b42df8b3
largefiles: don't verify largefile hashes on servers when processing statlfile
Mads Kiilerich <madski@unity3d.com>
parents:
18298
diff
changeset
|
91 return '0\n' |
15168 | 92 |
93 def wirereposetup(ui, repo): | |
94 class lfileswirerepository(repo.__class__): | |
95 def putlfile(self, sha, fd): | |
96 # unfortunately, httprepository._callpush tries to convert its | |
97 # input file-like into a bundle before sending it, so we can't use | |
98 # it ... | |
17192
1ac628cd7113
peer: introduce real peer classes
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
17127
diff
changeset
|
99 if issubclass(self.__class__, httppeer.httppeer): |
26825
78539633acf3
largefiles: don't mute and obfuscate http errors when putlfile fails
Mads Kiilerich <madski@unity3d.com>
parents:
26587
diff
changeset
|
100 res = self._call('putlfile', data=fd, sha=sha, |
78539633acf3
largefiles: don't mute and obfuscate http errors when putlfile fails
Mads Kiilerich <madski@unity3d.com>
parents:
26587
diff
changeset
|
101 headers={'content-type':'application/mercurial-0.1'}) |
15168 | 102 try: |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
103 d, output = res.split('\n', 1) |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
104 for l in output.splitlines(True): |
19949
29f12a7a03ee
largefiles: don't add extra \n when displaying remote messages in putlfile
Mads Kiilerich <madski@unity3d.com>
parents:
19948
diff
changeset
|
105 self.ui.warn(_('remote: '), l) # assume l ends with \n |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
106 return int(d) |
26825
78539633acf3
largefiles: don't mute and obfuscate http errors when putlfile fails
Mads Kiilerich <madski@unity3d.com>
parents:
26587
diff
changeset
|
107 except ValueError: |
19947
2a03faf8b5fe
largefiles: fix 'unexpected response' warning newlines
Mads Kiilerich <madski@unity3d.com>
parents:
19917
diff
changeset
|
108 self.ui.warn(_('unexpected putlfile response: %r\n') % res) |
15168 | 109 return 1 |
110 # ... but we can't use sshrepository._call because the data= | |
111 # argument won't get sent, and _callpush does exactly what we want | |
112 # in this case: send the data straight through | |
113 else: | |
114 try: | |
115 ret, output = self._callpush("putlfile", fd, sha=sha) | |
116 if ret == "": | |
117 raise error.ResponseError(_('putlfile failed:'), | |
118 output) | |
119 return int(ret) | |
120 except IOError: | |
121 return 1 | |
122 except ValueError: | |
123 raise error.ResponseError( | |
124 _('putlfile failed (unexpected response):'), ret) | |
125 | |
126 def getlfile(self, sha): | |
19004
6614e5e24e66
largefiles: move protocol conversion into getlfile and make it an iterable
Mads Kiilerich <madski@unity3d.com>
parents:
18922
diff
changeset
|
127 """returns an iterable with the chunks of the file with sha sha""" |
15168 | 128 stream = self._callstream("getlfile", sha=sha) |
129 length = stream.readline() | |
130 try: | |
131 length = int(length) | |
132 except ValueError: | |
15170
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15168
diff
changeset
|
133 self._abort(error.ResponseError(_("unexpected response:"), |
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15168
diff
changeset
|
134 length)) |
19004
6614e5e24e66
largefiles: move protocol conversion into getlfile and make it an iterable
Mads Kiilerich <madski@unity3d.com>
parents:
18922
diff
changeset
|
135 |
19005
1b84047e7d16
largefiles: drop limitreader, use filechunkiter limit
Mads Kiilerich <madski@unity3d.com>
parents:
19004
diff
changeset
|
136 # SSH streams will block if reading more than length |
30181
7356e6b1f5b8
util: increase filechunkiter size to 128k
Mads Kiilerich <madski@unity3d.com>
parents:
29312
diff
changeset
|
137 for chunk in util.filechunkiter(stream, limit=length): |
19004
6614e5e24e66
largefiles: move protocol conversion into getlfile and make it an iterable
Mads Kiilerich <madski@unity3d.com>
parents:
18922
diff
changeset
|
138 yield chunk |
19006
0b3b84222a2d
largefiles: getlfile must hit end of HTTP chunked streams to reuse connections
Mads Kiilerich <madski@unity3d.com>
parents:
19005
diff
changeset
|
139 # HTTP streams must hit the end to process the last empty |
0b3b84222a2d
largefiles: getlfile must hit end of HTTP chunked streams to reuse connections
Mads Kiilerich <madski@unity3d.com>
parents:
19005
diff
changeset
|
140 # chunk of Chunked-Encoding so the connection can be reused. |
0b3b84222a2d
largefiles: getlfile must hit end of HTTP chunked streams to reuse connections
Mads Kiilerich <madski@unity3d.com>
parents:
19005
diff
changeset
|
141 if issubclass(self.__class__, httppeer.httppeer): |
0b3b84222a2d
largefiles: getlfile must hit end of HTTP chunked streams to reuse connections
Mads Kiilerich <madski@unity3d.com>
parents:
19005
diff
changeset
|
142 chunk = stream.read(1) |
0b3b84222a2d
largefiles: getlfile must hit end of HTTP chunked streams to reuse connections
Mads Kiilerich <madski@unity3d.com>
parents:
19005
diff
changeset
|
143 if chunk: |
0b3b84222a2d
largefiles: getlfile must hit end of HTTP chunked streams to reuse connections
Mads Kiilerich <madski@unity3d.com>
parents:
19005
diff
changeset
|
144 self._abort(error.ResponseError(_("unexpected response:"), |
0b3b84222a2d
largefiles: getlfile must hit end of HTTP chunked streams to reuse connections
Mads Kiilerich <madski@unity3d.com>
parents:
19005
diff
changeset
|
145 chunk)) |
15168 | 146 |
21084
70252bdfd39c
largefiles: import whole modules instead of importing parts of them
Mads Kiilerich <madski@unity3d.com>
parents:
19949
diff
changeset
|
147 @wireproto.batchable |
15168 | 148 def statlfile(self, sha): |
21084
70252bdfd39c
largefiles: import whole modules instead of importing parts of them
Mads Kiilerich <madski@unity3d.com>
parents:
19949
diff
changeset
|
149 f = wireproto.future() |
17127
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
150 result = {'sha': sha} |
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
151 yield result, f |
15168 | 152 try: |
17127
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
153 yield int(f.value) |
28883
032c4c2f802a
pycompat: switch to util.urlreq/util.urlerr for py3 compat
timeless <timeless@mozdev.org>
parents:
28576
diff
changeset
|
154 except (ValueError, urlerr.httperror): |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
155 # If the server returns anything but an integer followed by a |
15168 | 156 # newline, newline, it's not speaking our language; if we get |
157 # an HTTP error, we can't be sure the largefile is present; | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
158 # either way, consider it missing. |
17127
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
159 yield 2 |
15168 | 160 |
161 repo.__class__ = lfileswirerepository | |
162 | |
163 # advertise the largefiles=serve capability | |
164 def capabilities(repo, proto): | |
28576
33bd95443e7f
largefiles: add some docstrings
Mads Kiilerich <madski@unity3d.com>
parents:
26825
diff
changeset
|
165 '''Wrap server command to announce largefile server capability''' |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
166 return capabilitiesorig(repo, proto) + ' largefiles=serve' |
15168 | 167 |
168 def heads(repo, proto): | |
28576
33bd95443e7f
largefiles: add some docstrings
Mads Kiilerich <madski@unity3d.com>
parents:
26825
diff
changeset
|
169 '''Wrap server command - largefile capable clients will know to call |
33bd95443e7f
largefiles: add some docstrings
Mads Kiilerich <madski@unity3d.com>
parents:
26825
diff
changeset
|
170 lheads instead''' |
15168 | 171 if lfutil.islfilesrepo(repo): |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
172 return wireproto.ooberror(LARGEFILES_REQUIRED_MSG) |
15168 | 173 return wireproto.heads(repo, proto) |
174 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
175 def sshrepocallstream(self, cmd, **args): |
15168 | 176 if cmd == 'heads' and self.capable('largefiles'): |
177 cmd = 'lheads' | |
178 if cmd == 'batch' and self.capable('largefiles'): | |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30466
diff
changeset
|
179 args[r'cmds'] = args[r'cmds'].replace('heads ', 'lheads ') |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
180 return ssholdcallstream(self, cmd, **args) |
15168 | 181 |
19917
cff331cbb5ee
largefiles: make the protocol hack for replacing heads with lheads more precise
Mads Kiilerich <madski@unity3d.com>
parents:
19009
diff
changeset
|
182 headsre = re.compile(r'(^|;)heads\b') |
cff331cbb5ee
largefiles: make the protocol hack for replacing heads with lheads more precise
Mads Kiilerich <madski@unity3d.com>
parents:
19009
diff
changeset
|
183 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
184 def httprepocallstream(self, cmd, **args): |
15168 | 185 if cmd == 'heads' and self.capable('largefiles'): |
186 cmd = 'lheads' | |
187 if cmd == 'batch' and self.capable('largefiles'): | |
35348
576ba8194fa8
py3: handle keyword arguments correctly in hgext/largefiles/
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30466
diff
changeset
|
188 args[r'cmds'] = headsre.sub('lheads', args[r'cmds']) |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
189 return httpoldcallstream(self, cmd, **args) |