Mercurial > hg
diff hgext/largefiles/overrides.py @ 23537:f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
The recursive addremove operation occurs completely before the first subrepo is
committed. Only hg subrepos support the addremove operation at the moment- svn
and git subrepos will warn and abort the commit.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 24 Nov 2014 22:27:49 -0500 |
parents | 891aaa7c0c70 |
children | 495bc1b65d25 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Wed Nov 26 16:13:38 2014 -0500 +++ b/hgext/largefiles/overrides.py Mon Nov 24 22:27:49 2014 -0500 @@ -1084,10 +1084,10 @@ finally: repo.lfstatus = False -def scmutiladdremove(orig, repo, matcher, opts={}, dry_run=None, +def scmutiladdremove(orig, repo, matcher, prefix, opts={}, dry_run=None, similarity=None): if not lfutil.islfilesrepo(repo): - return orig(repo, matcher, opts, dry_run, similarity) + return orig(repo, matcher, prefix, opts, dry_run, similarity) # Get the list of missing largefiles so we can remove them lfdirstate = lfutil.openlfdirstate(repo.ui, repo) unsure, s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], @@ -1107,7 +1107,7 @@ # function to take care of the rest. Make sure it doesn't do anything with # largefiles by passing a matcher that will ignore them. matcher = composenormalfilematcher(matcher, repo[None].manifest()) - return orig(repo, matcher, opts, dry_run, similarity) + return orig(repo, matcher, prefix, opts, dry_run, similarity) # Calling purge with --all will cause the largefiles to be deleted. # Override repo.status to prevent this from happening.