##// END OF EJS Templates
largefiles: remove additional blank lines...
liscju -
r29420:e5c91dc9 default
parent child Browse files
Show More
@@ -31,7 +31,6 b" shortname = '.hglf'"
31 shortnameslash = shortname + '/'
31 shortnameslash = shortname + '/'
32 longname = 'largefiles'
32 longname = 'largefiles'
33
33
34
35 # -- Private worker functions ------------------------------------------
34 # -- Private worker functions ------------------------------------------
36
35
37 def getminsize(ui, assumelfiles, opt, default=10):
36 def getminsize(ui, assumelfiles, opt, default=10):
@@ -260,7 +259,6 b' def copyalltostore(repo, node):'
260 realfile = splitstandin(filename)
259 realfile = splitstandin(filename)
261 copytostore(repo, ctx.node(), realfile)
260 copytostore(repo, ctx.node(), realfile)
262
261
263
264 def copytostoreabsolute(repo, file, hash):
262 def copytostoreabsolute(repo, file, hash):
265 if inusercache(repo.ui, hash):
263 if inusercache(repo.ui, hash):
266 link(usercachepath(repo.ui, hash), storepath(repo, hash))
264 link(usercachepath(repo.ui, hash), storepath(repo, hash))
@@ -546,7 +546,6 b' def mergerecordupdates(orig, repo, actio'
546
546
547 return orig(repo, actions, branchmerge)
547 return orig(repo, actions, branchmerge)
548
548
549
550 # Override filemerge to prompt the user about how they wish to merge
549 # Override filemerge to prompt the user about how they wish to merge
551 # largefiles. This will handle identical edits without prompting the user.
550 # largefiles. This will handle identical edits without prompting the user.
552 def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca,
551 def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca,
General Comments 0
You need to be logged in to leave comments. Login now