##// END OF EJS Templates
wrapfunction: use sysstr instead of bytes as argument in "narrow"...
marmoute -
r51680:584fc92d default
parent child Browse files
Show More
@@ -193,7 +193,7 b' def _uisetup(ui):'
193 193 if name == b'rebase':
194 194 # TODO: teach exthelper to handle this
195 195 extensions.wrapfunction(
196 module, b'rebase', overrides.overriderebasecmd
196 module, 'rebase', overrides.overriderebasecmd
197 197 )
198 198
199 199
@@ -485,10 +485,10 b' def overridelog(orig, ui, repo, *pats, *'
485 485 return lambda ctx: match
486 486
487 487 wrappedmatchandpats = extensions.wrappedfunction(
488 scmutil, b'matchandpats', overridematchandpats
488 scmutil, 'matchandpats', overridematchandpats
489 489 )
490 490 wrappedmakefilematcher = extensions.wrappedfunction(
491 logcmdutil, b'_makenofollowfilematcher', overridemakefilematcher
491 logcmdutil, '_makenofollowfilematcher', overridemakefilematcher
492 492 )
493 493 with wrappedmatchandpats, wrappedmakefilematcher:
494 494 return orig(ui, repo, *pats, **opts)
@@ -793,7 +793,7 b' def overridecopy(orig, ui, repo, pats, o'
793 793 match = orig(ctx, pats, opts, globbed, default, badfn=badfn)
794 794 return composenormalfilematcher(match, manifest)
795 795
796 with extensions.wrappedfunction(scmutil, b'match', normalfilesmatchfn):
796 with extensions.wrappedfunction(scmutil, 'match', normalfilesmatchfn):
797 797 try:
798 798 result = orig(ui, repo, pats, opts, rename)
799 799 except error.Abort as e:
@@ -887,8 +887,8 b' def overridecopy(orig, ui, repo, pats, o'
887 887 copiedfiles.append((src, dest))
888 888 orig(src, dest, *args, **kwargs)
889 889
890 with extensions.wrappedfunction(util, b'copyfile', overridecopyfile):
891 with extensions.wrappedfunction(scmutil, b'match', overridematch):
890 with extensions.wrappedfunction(util, 'copyfile', overridecopyfile):
891 with extensions.wrappedfunction(scmutil, 'match', overridematch):
892 892 result += orig(ui, repo, listpats, opts, rename)
893 893
894 894 lfdirstate = lfutil.openlfdirstate(ui, repo)
@@ -999,7 +999,7 b' def overriderevert(orig, ui, repo, ctx, '
999 999 m.matchfn = matchfn
1000 1000 return m
1001 1001
1002 with extensions.wrappedfunction(scmutil, b'match', overridematch):
1002 with extensions.wrappedfunction(scmutil, 'match', overridematch):
1003 1003 orig(ui, repo, ctx, *pats, **opts)
1004 1004
1005 1005 newstandins = lfutil.getstandinsstate(repo)
@@ -128,7 +128,7 b' def clonenarrowcmd(orig, ui, repo, *args'
128 128 kwargs[b'depth'] = opts[b'depth']
129 129
130 130 wrappedextraprepare = extensions.wrappedfunction(
131 exchange, b'_pullbundle2extraprepare', pullbundle2extraprepare_widen
131 exchange, '_pullbundle2extraprepare', pullbundle2extraprepare_widen
132 132 )
133 133
134 134 with wrappedextraprepare:
@@ -146,7 +146,7 b' def pullnarrowcmd(orig, ui, repo, *args,'
146 146 kwargs[b'depth'] = opts['depth']
147 147
148 148 wrappedextraprepare = extensions.wrappedfunction(
149 exchange, b'_pullbundle2extraprepare', pullbundle2extraprepare_widen
149 exchange, '_pullbundle2extraprepare', pullbundle2extraprepare_widen
150 150 )
151 151
152 152 with wrappedextraprepare:
@@ -201,7 +201,7 b' def pullbundle2extraprepare(orig, pullop'
201 201
202 202
203 203 extensions.wrapfunction(
204 exchange, b'_pullbundle2extraprepare', pullbundle2extraprepare
204 exchange, '_pullbundle2extraprepare', pullbundle2extraprepare
205 205 )
206 206
207 207
@@ -366,7 +366,7 b' def _widen('
366 366 kwargs[b'excludepats'] = newexcludes
367 367
368 368 wrappedextraprepare = extensions.wrappedfunction(
369 exchange, b'_pullbundle2extraprepare', pullbundle2extraprepare_widen
369 exchange, '_pullbundle2extraprepare', pullbundle2extraprepare_widen
370 370 )
371 371
372 372 # define a function that narrowbundle2 can call after creating the
@@ -36,7 +36,7 b' def reposetup(repo):'
36 36 kwargs["excludepats"] = b','.join(exclude)
37 37 return orig(cmd, *args, **kwargs)
38 38
39 extensions.wrapfunction(peer, b'_calltwowaystream', wrapped)
39 extensions.wrapfunction(peer, '_calltwowaystream', wrapped)
40 40
41 41 hg.wirepeersetupfuncs.append(wirereposetup)
42 42
General Comments 0
You need to be logged in to leave comments. Login now