Mercurial > hg
comparison hgext/largefiles/overrides.py @ 23782:304e69cb1ee9
largefiles: enable subrepo support for remove
Previously, remove failed when operating on a largefile in a subrepo, stating
that the file is untracked.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 30 Dec 2014 21:12:52 -0500 |
parents | bb3ee61cfaa1 |
children | 2b79d124a12f |
comparison
equal
deleted
inserted
replaced
23781:49caef455912 | 23782:304e69cb1ee9 |
---|---|
258 result = orig(ui, repo, *pats, **opts) | 258 result = orig(ui, repo, *pats, **opts) |
259 restorematchfn() | 259 restorematchfn() |
260 | 260 |
261 return (result == 1 or bad) and 1 or 0 | 261 return (result == 1 or bad) and 1 or 0 |
262 | 262 |
263 def overrideremove(orig, ui, repo, *pats, **opts): | 263 def cmdutilremove(orig, ui, repo, matcher, prefix, after, force, subrepos): |
264 installnormalfilesmatchfn(repo[None].manifest()) | 264 normalmatcher = composenormalfilematcher(matcher, repo[None].manifest()) |
265 result = orig(ui, repo, *pats, **opts) | 265 result = orig(ui, repo, normalmatcher, prefix, after, force, subrepos) |
266 restorematchfn() | 266 return removelargefiles(ui, repo, False, matcher, after=after, |
267 matcher = scmutil.match(repo[None], pats, opts) | 267 force=force) or result |
268 return removelargefiles(ui, repo, False, matcher, **opts) or result | |
269 | 268 |
270 def overridestatusfn(orig, repo, rev2, **opts): | 269 def overridestatusfn(orig, repo, rev2, **opts): |
271 try: | 270 try: |
272 repo._repo.lfstatus = True | 271 repo._repo.lfstatus = True |
273 return orig(repo, rev2, **opts) | 272 return orig(repo, rev2, **opts) |