--- a/hgext/largefiles/overrides.py Fri Nov 27 17:00:00 2020 -0500
+++ b/hgext/largefiles/overrides.py Fri Nov 27 17:03:29 2020 -0500
@@ -58,8 +58,8 @@
def composelargefilematcher(match, manifest):
- '''create a matcher that matches only the largefiles in the original
- matcher'''
+ """create a matcher that matches only the largefiles in the original
+ matcher"""
m = copy.copy(match)
lfile = lambda f: lfutil.standin(f) in manifest
m._files = [lf for lf in m._files if lfile(lf)]
@@ -586,11 +586,17 @@
mresult.addfile(lfile, b'k', None, b'replaces standin')
if branchmerge:
mresult.addfile(
- standin, b'k', None, b'replaced by non-standin',
+ standin,
+ b'k',
+ None,
+ b'replaced by non-standin',
)
else:
mresult.addfile(
- standin, b'r', None, b'replaced by non-standin',
+ standin,
+ b'r',
+ None,
+ b'replaced by non-standin',
)
elif lm in (b'g', b'dc') and sm != b'r':
if lm == b'dc':
@@ -610,7 +616,10 @@
if branchmerge:
# largefile can be restored from standin safely
mresult.addfile(
- lfile, b'k', None, b'replaced by standin',
+ lfile,
+ b'k',
+ None,
+ b'replaced by standin',
)
mresult.addfile(standin, b'k', None, b'replaces standin')
else:
@@ -628,7 +637,10 @@
else: # pick remote normal file
mresult.addfile(lfile, b'g', largs, b'replaces standin')
mresult.addfile(
- standin, b'r', None, b'replaced by non-standin',
+ standin,
+ b'r',
+ None,
+ b'replaced by non-standin',
)
return mresult