##// END OF EJS Templates
largefiles: remove pre-1.7 compatibility code...
Martin Geisler -
r15626:931dc4af default
parent child Browse files
Show More
@@ -635,10 +635,7 b' def override_archive(orig, repo, dest, n'
635 if subrepos:
635 if subrepos:
636 for subpath in ctx.substate:
636 for subpath in ctx.substate:
637 sub = ctx.sub(subpath)
637 sub = ctx.sub(subpath)
638 try:
638 sub.archive(repo.ui, archiver, prefix)
639 sub.archive(repo.ui, archiver, prefix)
640 except TypeError:
641 sub.archive(archiver, prefix)
642
639
643 archiver.done()
640 archiver.done()
644
641
@@ -88,12 +88,8 b' def reposetup(ui, repo):'
88 clean=False, unknown=False, listsubrepos=False):
88 clean=False, unknown=False, listsubrepos=False):
89 listignored, listclean, listunknown = ignored, clean, unknown
89 listignored, listclean, listunknown = ignored, clean, unknown
90 if not self.lfstatus:
90 if not self.lfstatus:
91 try:
91 return super(lfiles_repo, self).status(node1, node2, match,
92 return super(lfiles_repo, self).status(node1, node2, match,
92 listignored, listclean, listunknown, listsubrepos)
93 listignored, listclean, listunknown, listsubrepos)
94 except TypeError:
95 return super(lfiles_repo, self).status(node1, node2, match,
96 listignored, listclean, listunknown)
97 else:
93 else:
98 # some calls in this function rely on the old version of status
94 # some calls in this function rely on the old version of status
99 self.lfstatus = False
95 self.lfstatus = False
@@ -140,12 +136,8 b' def reposetup(ui, repo):'
140
136
141 # Get ignored files here even if we weren't asked for them; we
137 # Get ignored files here even if we weren't asked for them; we
142 # must use the result here for filtering later
138 # must use the result here for filtering later
143 try:
139 result = super(lfiles_repo, self).status(node1, node2, m,
144 result = super(lfiles_repo, self).status(node1, node2, m,
140 True, clean, unknown, listsubrepos)
145 True, clean, unknown, listsubrepos)
146 except TypeError:
147 result = super(lfiles_repo, self).status(node1, node2, m,
148 True, clean, unknown)
149 if working:
141 if working:
150 # hold the wlock while we read largefiles and
142 # hold the wlock while we read largefiles and
151 # update the lfdirstate
143 # update the lfdirstate
General Comments 0
You need to be logged in to leave comments. Login now