##// END OF EJS Templates
largefiles: remove useless overrideupdate...
FUJIWARA Katsunori -
r24474:61a99993 default
parent child Browse files
Show More
@@ -409,36 +409,6 b' def overridedebugstate(orig, ui, repo, *'
409 else:
409 else:
410 orig(ui, repo, *pats, **opts)
410 orig(ui, repo, *pats, **opts)
411
411
412 # Override needs to refresh standins so that update's normal merge
413 # will go through properly. Then the other update hook (overriding repo.update)
414 # will get the new files. Filemerge is also overridden so that the merge
415 # will merge standins correctly.
416 def overrideupdate(orig, ui, repo, *pats, **opts):
417 # Need to lock between the standins getting updated and their
418 # largefiles getting updated
419 wlock = repo.wlock()
420 try:
421 if opts['check']:
422 lfdirstate = lfutil.openlfdirstate(ui, repo)
423 unsure, s = lfdirstate.status(
424 match_.always(repo.root, repo.getcwd()),
425 [], False, False, False)
426
427 mod = len(s.modified) > 0
428 for lfile in unsure:
429 standin = lfutil.standin(lfile)
430 if repo['.'][standin].data().strip() != \
431 lfutil.hashfile(repo.wjoin(lfile)):
432 mod = True
433 else:
434 lfdirstate.normal(lfile)
435 lfdirstate.write()
436 if mod:
437 raise util.Abort(_('uncommitted changes'))
438 return orig(ui, repo, *pats, **opts)
439 finally:
440 wlock.release()
441
442 # Before starting the manifest merge, merge.updates will call
412 # Before starting the manifest merge, merge.updates will call
443 # _checkunknownfile to check if there are any files in the merged-in
413 # _checkunknownfile to check if there are any files in the merged-in
444 # changeset that collide with unknown files in the working copy.
414 # changeset that collide with unknown files in the working copy.
@@ -76,8 +76,6 b' def uisetup(ui):'
76 entry[1].extend(summaryopt)
76 entry[1].extend(summaryopt)
77 cmdutil.summaryremotehooks.add('largefiles', overrides.summaryremotehook)
77 cmdutil.summaryremotehooks.add('largefiles', overrides.summaryremotehook)
78
78
79 entry = extensions.wrapcommand(commands.table, 'update',
80 overrides.overrideupdate)
81 entry = extensions.wrapcommand(commands.table, 'pull',
79 entry = extensions.wrapcommand(commands.table, 'pull',
82 overrides.overridepull)
80 overrides.overridepull)
83 pullopt = [('', 'all-largefiles', None,
81 pullopt = [('', 'all-largefiles', None,
General Comments 0
You need to be logged in to leave comments. Login now