Show More
@@ -135,11 +135,8 b' def openlfdirstate(ui, repo):' | |||||
135 | ''' |
|
135 | ''' | |
136 | admin = repo.join(longname) |
|
136 | admin = repo.join(longname) | |
137 | opener = scmutil.opener(admin) |
|
137 | opener = scmutil.opener(admin) | |
138 | if util.safehasattr(repo.dirstate, '_validate'): |
|
138 | lfdirstate = largefiles_dirstate(opener, ui, repo.root, | |
139 | lfdirstate = largefiles_dirstate(opener, ui, repo.root, |
|
139 | repo.dirstate._validate) | |
140 | repo.dirstate._validate) |
|
|||
141 | else: |
|
|||
142 | lfdirstate = largefiles_dirstate(opener, ui, repo.root) |
|
|||
143 |
|
140 | |||
144 | # If the largefiles dirstate does not exist, populate and create |
|
141 | # If the largefiles dirstate does not exist, populate and create | |
145 | # it. This ensures that we create it on the first meaningful |
|
142 | # it. This ensures that we create it on the first meaningful |
@@ -82,12 +82,8 b' def uisetup(ui):' | |||||
82 | extensions.wrapfunction(hg, 'merge', overrides.hg_merge) |
|
82 | extensions.wrapfunction(hg, 'merge', overrides.hg_merge) | |
83 |
|
83 | |||
84 | extensions.wrapfunction(archival, 'archive', overrides.override_archive) |
|
84 | extensions.wrapfunction(archival, 'archive', overrides.override_archive) | |
85 |
|
|
85 | extensions.wrapfunction(cmdutil, 'bailifchanged', | |
86 | extensions.wrapfunction(cmdutil, 'bailifchanged', |
|
86 | overrides.override_bailifchanged) | |
87 | overrides.override_bailifchanged) |
|
|||
88 | else: |
|
|||
89 | extensions.wrapfunction(cmdutil, 'bail_if_changed', |
|
|||
90 | overrides.override_bailifchanged) |
|
|||
91 |
|
87 | |||
92 | # create the new wireproto commands ... |
|
88 | # create the new wireproto commands ... | |
93 | wireproto.commands['putlfile'] = (proto.putlfile, 'sha') |
|
89 | wireproto.commands['putlfile'] = (proto.putlfile, 'sha') |
General Comments 0
You need to be logged in to leave comments.
Login now