mercurial: comparison hgext/largefiles/reposetup.py

equal deleted inserted replaced

-:2372284d9457
+:687b865b95ad
 lfutil.standin(path), fileid, filelog
 )
 else:
 result = orig(lfutil.standin(path), fileid)
 olddata = result.data
-result.data = lambda: olddata() + '\0'
+result.data = lambda: olddata() + b'\0'
 return result
 ctx.__class__ = lfilesctx
 return ctx
 # XXX large file status is buggy when used on repo proxy.
 # XXX this needs to be investigated.
 @localrepo.unfilteredmethod
 def status(
 self,
-node1='.',
+node1=b'.',
 node2=None,
 match=None,
 ignored=False,
 clean=False,
 unknown=False,
 # some calls in this function rely on the old version of status
 self.lfstatus = False
 ctx1 = self[node1]
 ctx2 = self[node2]
 working = ctx2.rev() is None
-parentworking = working and ctx1 == self['.']
+parentworking = working and ctx1 == self[b'.']
 if match is None:
 match = matchmod.always()
 wlock = None
 if (
 lfutil.readasstandin(ctx1[standin])
 != lfutil.hashfile(abslfile)
 ) or (
 checkexec
-and ('x' in ctx1.flags(standin))
+and (b'x' in ctx1.flags(standin))
 != bool(lfutil.getexecutable(abslfile))
 ):
 modified.append(lfile)
 elif listclean:
 clean.append(lfile)
 # Before commit, largefile standins have not had their
 # contents updated to reflect the hash of their largefile.
 # Do that here.
 def commit(
 self,
-text="",
+text=b"",
 user=None,
 date=None,
 match=None,
 force=False,
 editor=False,
 def push(self, remote, force=False, revs=None, newbranch=False):
 if remote.local():
 missing = set(self.requirements) - remote.local().supported
 if missing:
 msg = _(
-"required features are not"
+b"required features are not"
-" supported in the destination:"
+b" supported in the destination:"
-" %s"
+b" %s"
-) % (', '.join(sorted(missing)))
+) % (b', '.join(sorted(missing)))
 raise error.Abort(msg)
 return super(lfilesrepo, self).push(
 remote, force=force, revs=revs, newbranch=newbranch
 )
 actualfiles = []
 dirs = []
 regulars = []
 for f in files:
-if lfutil.isstandin(f + '/'):
+if lfutil.isstandin(f + b'/'):
 raise error.Abort(
-_('file "%s" is a largefile standin') % f,
+_(b'file "%s" is a largefile standin') % f,
-hint='commit the largefile itself instead',
+hint=b'commit the largefile itself instead',
 )
 # Scan directories
 if self.wvfs.isdir(f):
 dirs.append(f)
 else:
 regulars.append(f)
 for f in dirs:
 matcheddir = False
-d = self.dirstate.normalize(f) + '/'
+d = self.dirstate.normalize(f) + b'/'
 # Check for matched normal files
 for mf in regulars:
 if self.dirstate.normalize(mf).startswith(d):
 actualfiles.append(f)
 matcheddir = True
 # There may still be normal files in the dir, so
 # add a directory to the list, which
 # forces status/dirstate to walk all files and
 # call the match function on the matcher, even
 # on case sensitive filesystems.
-actualfiles.append('.')
+actualfiles.append(b'.')
 matcheddir = True
 # Nothing in dir, so readd it
 # and let commit reject it
 if not matcheddir:
 actualfiles.append(f)
 toupload = set()
 addfunc = lambda fn, lfhash: toupload.add(lfhash)
 lfutil.getlfilestoupload(pushop.repo, lfrevs, addfunc)
 lfcommands.uploadlfiles(ui, pushop.repo, pushop.remote, toupload)
-repo.prepushoutgoinghooks.add("largefiles", prepushoutgoinghook)
+repo.prepushoutgoinghooks.add(b"largefiles", prepushoutgoinghook)
 def checkrequireslfiles(ui, repo, **kwargs):
-if 'largefiles' not in repo.requirements and any(
+if b'largefiles' not in repo.requirements and any(
-lfutil.shortname + '/' in f[0] for f in repo.store.datafiles()
+lfutil.shortname + b'/' in f[0] for f in repo.store.datafiles()
 ):
-repo.requirements.add('largefiles')
+repo.requirements.add(b'largefiles')
 repo._writerequirements()
 ui.setconfig(
-'hooks', 'changegroup.lfiles', checkrequireslfiles, 'largefiles'
+b'hooks', b'changegroup.lfiles', checkrequireslfiles, b'largefiles'
 )
-ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles, 'largefiles')
+ui.setconfig(b'hooks', b'commit.lfiles', checkrequireslfiles, b'largefiles')

changeset 43077	687b865b95ad
parent 43076	2372284d9457
child 43435	0371a8c84827