diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py --- a/hgext/largefiles/lfutil.py +++ b/hgext/largefiles/lfutil.py @@ -31,7 +31,6 @@ shortname = '.hglf' shortnameslash = shortname + '/' longname = 'largefiles' - # -- Private worker functions ------------------------------------------ def getminsize(ui, assumelfiles, opt, default=10): @@ -260,7 +259,6 @@ def copyalltostore(repo, node): realfile = splitstandin(filename) copytostore(repo, ctx.node(), realfile) - def copytostoreabsolute(repo, file, hash): if inusercache(repo.ui, hash): link(usercachepath(repo.ui, hash), storepath(repo, hash)) diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -546,7 +546,6 @@ def mergerecordupdates(orig, repo, actio return orig(repo, actions, branchmerge) - # Override filemerge to prompt the user about how they wish to merge # largefiles. This will handle identical edits without prompting the user. def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca,