hgext/largefiles/uisetup.py
author Na'Tosha Bard <natosha@unity3d.com>
Mon, 13 Feb 2012 18:37:07 +0100
changeset 16120 47ee41fcf42b
parent 16093 7e30f5f2285f
child 16247 d87d9d8a8e03
permissions -rw-r--r--
largefiles: optimize update speed by only updating changed largefiles Historically, during 'hg update', every largefile in the working copy was hashed (which is a very expensive operation on big files) and any largefiles that did not have a hash that matched their standin were updated. This patch optimizes 'hg update' by keeping track of what standins have changed between the old and new revisions, and only updating the largefiles that have changed. This saves a lot of time by avoiding the unecessary calculation of a list of sha1 hashes for big files. With this patch, the time 'hg update' takes to complete is a function of how many largefiles need to be updated and what their size is. Performance tests on a repository with about 80 largefiles ranging from a few MB to about 97 MB are shown below. The tests show how long it takes to run 'hg update' with no changes actually being updated. Mercurial 2.1 release: $ time hg update 0 files updated, 0 files merged, 0 files removed, 0 files unresolved getting changed largefiles 0 largefiles updated, 0 removed real 0m10.045s user 0m9.367s sys 0m0.674s With this patch: $ time hg update 0 files updated, 0 files merged, 0 files removed, 0 files unresolved real 0m0.965s user 0m0.845s sys 0m0.115s The same repsoitory, without the largefiles extension enabled: $ time hg update 0 files updated, 0 files merged, 0 files removed, 0 files unresolved real 0m0.799s user 0m0.684s sys 0m0.111s So before the patch, 'hg update' with no changes was approximately 9.25s slower with largefiles enabled. With this patch, it is approximately 0.165s slower.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
     1
# Copyright 2009-2010 Gregory P. Ward
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
     2
# Copyright 2009-2010 Intelerad Medical Systems Incorporated
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
     3
# Copyright 2010-2011 Fog Creek Software
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
     4
# Copyright 2010-2011 Unity Technologies
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
     5
#
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
     6
# This software may be used and distributed according to the terms of the
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
     7
# GNU General Public License version 2 or any later version.
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
     8
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
     9
'''setup for largefiles extension: uisetup'''
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    10
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    11
from mercurial import archival, cmdutil, commands, extensions, filemerge, hg, \
15663
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents: 15383
diff changeset
    12
    httprepo, localrepo, merge, sshrepo, sshserver, wireproto
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    13
from mercurial.i18n import _
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    14
from mercurial.hgweb import hgweb_mod, protocol
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    15
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    16
import overrides
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    17
import proto
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    18
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    19
def uisetup(ui):
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    20
    # Disable auto-status for some commands which assume that all
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    21
    # files in the result are under Mercurial's control
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    22
15170
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    23
    entry = extensions.wrapcommand(commands.table, 'add',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    24
                                   overrides.override_add)
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    25
    addopt = [('', 'large', None, _('add as largefile')),
15944
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15674
diff changeset
    26
              ('', 'normal', None, _('add as normal file')),
15627
9d7a83a42f8c largefiles: fix indentation
Martin Geisler <mg@aragost.com>
parents: 15383
diff changeset
    27
              ('', 'lfsize', '', _('add all files above this size '
9d7a83a42f8c largefiles: fix indentation
Martin Geisler <mg@aragost.com>
parents: 15383
diff changeset
    28
                                   '(in megabytes) as largefiles '
9d7a83a42f8c largefiles: fix indentation
Martin Geisler <mg@aragost.com>
parents: 15383
diff changeset
    29
                                   '(default: 10)'))]
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    30
    entry[1].extend(addopt)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    31
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    32
    entry = extensions.wrapcommand(commands.table, 'addremove',
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    33
            overrides.override_addremove)
15170
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    34
    entry = extensions.wrapcommand(commands.table, 'remove',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    35
                                   overrides.override_remove)
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    36
    entry = extensions.wrapcommand(commands.table, 'forget',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    37
                                   overrides.override_forget)
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    38
    entry = extensions.wrapcommand(commands.table, 'status',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    39
                                   overrides.override_status)
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    40
    entry = extensions.wrapcommand(commands.table, 'log',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    41
                                   overrides.override_log)
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    42
    entry = extensions.wrapcommand(commands.table, 'rollback',
15170
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    43
                                   overrides.override_rollback)
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    44
    entry = extensions.wrapcommand(commands.table, 'verify',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    45
                                   overrides.override_verify)
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    46
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    47
    verifyopt = [('', 'large', None, _('verify largefiles')),
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    48
                 ('', 'lfa', None,
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    49
                     _('verify all revisions of largefiles not just current')),
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    50
                 ('', 'lfc', None,
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    51
                     _('verify largefile contents not just existence'))]
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    52
    entry[1].extend(verifyopt)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    53
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    54
    entry = extensions.wrapcommand(commands.table, 'outgoing',
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    55
        overrides.override_outgoing)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    56
    outgoingopt = [('', 'large', None, _('display outgoing largefiles'))]
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    57
    entry[1].extend(outgoingopt)
15170
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    58
    entry = extensions.wrapcommand(commands.table, 'summary',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    59
                                   overrides.override_summary)
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    60
    summaryopt = [('', 'large', None, _('display outgoing largefiles'))]
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    61
    entry[1].extend(summaryopt)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    62
15170
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    63
    entry = extensions.wrapcommand(commands.table, 'update',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    64
                                   overrides.override_update)
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    65
    entry = extensions.wrapcommand(commands.table, 'pull',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    66
                                   overrides.override_pull)
16093
7e30f5f2285f merge: refactor unknown file conflict checking
Matt Mackall <mpm@selenic.com>
parents: 15944
diff changeset
    67
    entry = extensions.wrapfunction(merge, '_checkunknownfile',
7e30f5f2285f merge: refactor unknown file conflict checking
Matt Mackall <mpm@selenic.com>
parents: 15944
diff changeset
    68
                                    overrides.override_checkunknownfile)
15663
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents: 15383
diff changeset
    69
    entry = extensions.wrapfunction(merge, 'manifestmerge',
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084)
Martin Geisler <mg@aragost.com>
parents: 15383
diff changeset
    70
                                    overrides.override_manifestmerge)
15170
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    71
    entry = extensions.wrapfunction(filemerge, 'filemerge',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    72
                                    overrides.override_filemerge)
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    73
    entry = extensions.wrapfunction(cmdutil, 'copy',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    74
                                    overrides.override_copy)
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    75
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    76
    # Backout calls revert so we need to override both the command and the
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    77
    # function
15170
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    78
    entry = extensions.wrapcommand(commands.table, 'revert',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    79
                                   overrides.override_revert)
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    80
    entry = extensions.wrapfunction(commands, 'revert',
c1a4a3220711 largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents: 15169
diff changeset
    81
                                    overrides.override_revert)
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    82
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    83
    # clone uses hg._update instead of hg.update even though they are the
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    84
    # same function... so wrap both of them)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    85
    extensions.wrapfunction(hg, 'update', overrides.hg_update)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    86
    extensions.wrapfunction(hg, '_update', overrides.hg_update)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    87
    extensions.wrapfunction(hg, 'clean', overrides.hg_clean)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    88
    extensions.wrapfunction(hg, 'merge', overrides.hg_merge)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    89
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    90
    extensions.wrapfunction(archival, 'archive', overrides.override_archive)
15349
63455eb771af largefiles: drop more unnecessary compatibility checks
Greg Ward <greg@gerg.ca>
parents: 15295
diff changeset
    91
    extensions.wrapfunction(cmdutil, 'bailifchanged',
63455eb771af largefiles: drop more unnecessary compatibility checks
Greg Ward <greg@gerg.ca>
parents: 15295
diff changeset
    92
                            overrides.override_bailifchanged)
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    93
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    94
    # create the new wireproto commands ...
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    95
    wireproto.commands['putlfile'] = (proto.putlfile, 'sha')
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    96
    wireproto.commands['getlfile'] = (proto.getlfile, 'sha')
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    97
    wireproto.commands['statlfile'] = (proto.statlfile, 'sha')
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    98
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
    99
    # ... and wrap some existing ones
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   100
    wireproto.commands['capabilities'] = (proto.capabilities, '')
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   101
    wireproto.commands['heads'] = (proto.heads, '')
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   102
    wireproto.commands['lheads'] = (wireproto.heads, '')
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   103
15254
dd03d3a9f888 largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents: 15252
diff changeset
   104
    # make putlfile behave the same as push and {get,stat}lfile behave
dd03d3a9f888 largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca>
parents: 15252
diff changeset
   105
    # the same as pull w.r.t. permissions checks
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   106
    hgweb_mod.perms['putlfile'] = 'push'
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   107
    hgweb_mod.perms['getlfile'] = 'pull'
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   108
    hgweb_mod.perms['statlfile'] = 'pull'
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   109
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   110
    # the hello wireproto command uses wireproto.capabilities, so it won't see
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   111
    # our largefiles capability unless we replace the actual function as well.
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   112
    proto.capabilities_orig = wireproto.capabilities
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   113
    wireproto.capabilities = proto.capabilities
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   114
15252
6e809bb4f969 largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents: 15188
diff changeset
   115
    # these let us reject non-largefiles clients and make them display
6e809bb4f969 largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents: 15188
diff changeset
   116
    # our error messages
15168
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   117
    protocol.webproto.refuseclient = proto.webproto_refuseclient
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   118
    sshserver.sshserver.refuseclient = proto.sshproto_refuseclient
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   119
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   120
    # can't do this in reposetup because it needs to have happened before
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   121
    # wirerepo.__init__ is called
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   122
    proto.ssh_oldcallstream = sshrepo.sshrepository._callstream
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   123
    proto.http_oldcallstream = httprepo.httprepository._callstream
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   124
    sshrepo.sshrepository._callstream = proto.sshrepo_callstream
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   125
    httprepo.httprepository._callstream = proto.httprepo_callstream
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   126
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   127
    # don't die on seeing a repo with the largefiles requirement
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   128
    localrepo.localrepository.supported |= set(['largefiles'])
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   129
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   130
    # override some extensions' stuff as well
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   131
    for name, module in extensions.extensions():
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   132
        if name == 'fetch':
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   133
            extensions.wrapcommand(getattr(module, 'cmdtable'), 'fetch',
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   134
                overrides.override_fetch)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   135
        if name == 'purge':
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   136
            extensions.wrapcommand(getattr(module, 'cmdtable'), 'purge',
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   137
                overrides.override_purge)
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   138
        if name == 'rebase':
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   139
            extensions.wrapcommand(getattr(module, 'cmdtable'), 'rebase',
cfccd3bee7b3 hgext: add largefiles extension
various
parents:
diff changeset
   140
                overrides.override_rebase)
15383
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15356
diff changeset
   141
        if name == 'transplant':
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15356
diff changeset
   142
            extensions.wrapcommand(getattr(module, 'cmdtable'), 'transplant',
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15356
diff changeset
   143
                overrides.override_transplant)