Skip to content

fix some bugs #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yirui-wang-0212 wants to merge 1 commit into
base: add-lfs-support-v2
Choose a base branch
from
Open

fix some bugs #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions hg-fast-export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,14 @@ def generate_git_lfs_pointer(filename):
buf = bfile.read(lfs_pointer_buffer_size)
digest = hasher.hexdigest()
try:
os.makedirs("lfs/objects/%s/%s" % (digest[0:2],digest[2:4]))
os.makedirs(".git/lfs/objects/%s/%s" % (digest[0:2],digest[2:4]))
except:
pass
# Once we find where to put the large file, we need to copy it to the
# cached location so the git lfs filter replaces the file pointer with
# large file. If upload is required, it also needs to be in the git
# cache location.
shutil.copy2(filename, "lfs/objects/%s/%s/%s" % (digest[0:2],digest[2:4],digest))
shutil.copy2(filename, ".git/lfs/objects/%s/%s/%s" % (digest[0:2],digest[2:4],digest))
return """version https://git-lfs.github.com/spec/v1
oid sha256:%s
size %d
Expand All @@ -217,6 +217,7 @@ def export_file_contents(ctx,manifest,files,hgtags,encoding='',filter_contents=N
filename = filename[5:]
sys.stderr.write("Detected large file named %s\n" % (filename))
#should detect where the large files are located
d=ctx.filectx(file).data()
lfsFileCached = lfutil.findfile(ctx.repo(), d.strip('\n'))
if lfsFileCached is not None:
d = generate_git_lfs_pointer(lfsFileCached)
Expand All @@ -228,9 +229,9 @@ def export_file_contents(ctx,manifest,files,hgtags,encoding='',filter_contents=N
sys.stderr.write("Please clone with --all-largefiles\n")
sys.stderr.write("or pull with --lfrev %s\n" % (str(ctx.rev())))
sys.exit(3) # closing in the middle of import will revert everything to the last checkpoint

file_ctx=ctx.filectx(file)
d=file_ctx.data()
else:
file_ctx=ctx.filectx(file)
d=file_ctx.data()
if filter_contents:
import subprocess
filter_cmd=filter_contents + [filename,node.hex(file_ctx.filenode()),'1' if file_ctx.isbinary() else '0']
Expand Down