Mercurial > hg-stable
changeset 15349:63455eb771af stable
largefiles: drop more unnecessary compatibility checks
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Sun, 23 Oct 2011 10:23:31 -0400 |
| parents | c681e478c429 |
| children | 8b8dd13295db |
| files | hgext/largefiles/lfutil.py hgext/largefiles/uisetup.py |
| diffstat | 2 files changed, 4 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/lfutil.py Sun Oct 23 16:32:27 2011 -0500 +++ b/hgext/largefiles/lfutil.py Sun Oct 23 10:23:31 2011 -0400 @@ -135,11 +135,8 @@ ''' admin = repo.join(longname) opener = scmutil.opener(admin) - if util.safehasattr(repo.dirstate, '_validate'): - lfdirstate = largefiles_dirstate(opener, ui, repo.root, - repo.dirstate._validate) - else: - lfdirstate = largefiles_dirstate(opener, ui, repo.root) + lfdirstate = largefiles_dirstate(opener, ui, repo.root, + repo.dirstate._validate) # If the largefiles dirstate does not exist, populate and create # it. This ensures that we create it on the first meaningful
--- a/hgext/largefiles/uisetup.py Sun Oct 23 16:32:27 2011 -0500 +++ b/hgext/largefiles/uisetup.py Sun Oct 23 10:23:31 2011 -0400 @@ -82,12 +82,8 @@ extensions.wrapfunction(hg, 'merge', overrides.hg_merge) extensions.wrapfunction(archival, 'archive', overrides.override_archive) - if util.safehasattr(cmdutil, 'bailifchanged'): - extensions.wrapfunction(cmdutil, 'bailifchanged', - overrides.override_bailifchanged) - else: - extensions.wrapfunction(cmdutil, 'bail_if_changed', - overrides.override_bailifchanged) + extensions.wrapfunction(cmdutil, 'bailifchanged', + overrides.override_bailifchanged) # create the new wireproto commands ... wireproto.commands['putlfile'] = (proto.putlfile, 'sha')