Mercurial > public > mercurial-scm > hg-stable
diff hgext/largefiles/overrides.py @ 23592:96d335e4eacb stable
largefiles: don't actually remove largefiles in an addremove dry run
The addlargefiles() method already properly handled dry runs.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 13 Dec 2014 13:33:48 -0500 |
| parents | a34a99181f36 |
| children | a4679a74df14 f1e6b86da4c0 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Mon Dec 08 15:41:54 2014 -0800 +++ b/hgext/largefiles/overrides.py Sat Dec 13 13:33:48 2014 -0500 @@ -189,8 +189,15 @@ # are removing the file. if isaddremove: ui.status(_('removing %s\n') % f) - util.unlinkpath(repo.wjoin(f), ignoremissing=True) - lfdirstate.remove(f) + + if not opts.get('dry_run'): + if not after: + util.unlinkpath(repo.wjoin(f), ignoremissing=True) + lfdirstate.remove(f) + + if opts.get('dry_run'): + return result + lfdirstate.write() remove = [lfutil.standin(f) for f in remove] # If this is being called by addremove, let the original addremove