# HG changeset patch # User Martin Geisler # Date 1323271551 -3600 # Node ID 931dc4af0d95f4c2803d9632c7c5a3bf9f614df7 # Parent efdcce3fd2d5684adccad4a86c5849658072640c largefiles: remove pre-1.7 compatibility code Mercurial 1.7 added the --subrepos flag to status and archive and the largefiles code was still compatible with the old method signatures. diff -r efdcce3fd2d5 -r 931dc4af0d95 hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py Fri Dec 09 17:34:53 2011 +0100 +++ b/hgext/largefiles/overrides.py Wed Dec 07 16:25:51 2011 +0100 @@ -635,10 +635,7 @@ if subrepos: for subpath in ctx.substate: sub = ctx.sub(subpath) - try: - sub.archive(repo.ui, archiver, prefix) - except TypeError: - sub.archive(archiver, prefix) + sub.archive(repo.ui, archiver, prefix) archiver.done() diff -r efdcce3fd2d5 -r 931dc4af0d95 hgext/largefiles/reposetup.py --- a/hgext/largefiles/reposetup.py Fri Dec 09 17:34:53 2011 +0100 +++ b/hgext/largefiles/reposetup.py Wed Dec 07 16:25:51 2011 +0100 @@ -88,12 +88,8 @@ clean=False, unknown=False, listsubrepos=False): listignored, listclean, listunknown = ignored, clean, unknown if not self.lfstatus: - try: - return super(lfiles_repo, self).status(node1, node2, match, - listignored, listclean, listunknown, listsubrepos) - except TypeError: - return super(lfiles_repo, self).status(node1, node2, match, - listignored, listclean, listunknown) + return super(lfiles_repo, self).status(node1, node2, match, + listignored, listclean, listunknown, listsubrepos) else: # some calls in this function rely on the old version of status self.lfstatus = False @@ -140,12 +136,8 @@ # Get ignored files here even if we weren't asked for them; we # must use the result here for filtering later - try: - result = super(lfiles_repo, self).status(node1, node2, m, - True, clean, unknown, listsubrepos) - except TypeError: - result = super(lfiles_repo, self).status(node1, node2, m, - True, clean, unknown) + result = super(lfiles_repo, self).status(node1, node2, m, + True, clean, unknown, listsubrepos) if working: # hold the wlock while we read largefiles and # update the lfdirstate