Mercurial > hg-stable
changeset 15626:931dc4af0d95
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.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Wed, 07 Dec 2011 16:25:51 +0100 |
| parents | efdcce3fd2d5 |
| children | 9d7a83a42f8c |
| files | hgext/largefiles/overrides.py hgext/largefiles/reposetup.py |
| diffstat | 2 files changed, 5 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- 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()
--- 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