Changeset c08f68ca89ab…
Parent 467bba3abf63…
by
Changes to 4 files · Browse files at c08f68ca89ab Showing diff from parent 467bba3abf63 Diff from another changeset...
@@ -47,7 +47,7 @@ return None
try:
data = fctx.data()
- if '\0' in data or ctx.isKbf(wfile):
+ if '\0' in data or ctx.isStandin(wfile):
self.error = p + _('File is binary.\n')
return None
except (EnvironmentError, util.Abort), e:
@@ -303,7 +303,7 @@ else:
self.contents = olddata
self.flabel += _(' <i>(was deleted)</i>')
- elif hasattr(ctx.p1(), 'hasBfile') and ctx.p1().hasBfile(wfile):
+ elif hasattr(ctx.p1(), 'hasStandin') and ctx.p1().hasStandin(wfile):
self.error = 'binary file'
self.flabel += _(' <i>(was deleted)</i>')
else:
@@ -319,7 +319,7 @@ return
else:
data = util.posixfile(absfile, 'r').read()
- elif ctx.hasBfile(wfile):
+ elif ctx.hasStandin(wfile):
data = '\0'
else:
data = ctx.filectx(wfile).data()
@@ -330,8 +330,8 @@ return
if status in ('M', 'A'):
- if ctx.hasBfile(wfile):
- wfile = ctx.standin(wfile)
+ if ctx.hasStandin(wfile):
+ wfile = ctx.findStandin(wfile)
isbfile = True
res = self.checkMaxDiff(ctx, wfile, maxdiff)
if res is None:
|
@@ -144,7 +144,7 @@ for lst, flag in ((added, 'A'), (modified, 'M'), (removed, 'R')):
for f in filter(func, lst):
wasmerged = ismerge and f in ctxfiles
- f = self._ctx.removeKbf(f)
+ f = self._ctx.removeStandin(f)
files.append({'path': f, 'status': flag, 'parent': parent,
'wasmerged': wasmerged})
return files
|
@@ -252,7 +252,7 @@ continue
origpath = path
- path = self._repo.removeKbf(path)
+ path = self._repo.removeStandin(path)
e = treeroot
for p in hglib.tounicode(path).split('/'):
|
Loading...