# HG changeset patch # User Matt Harbison # Date 1418495628 18000 # Node ID 96d335e4eacbe19212d018cbeea370a614c30a33 # Parent 424d669118d323ca1aeb309f2a8a4631f69d1fe3 largefiles: don't actually remove largefiles in an addremove dry run The addlargefiles() method already properly handled dry runs. diff -r 424d669118d3 -r 96d335e4eacb hgext/largefiles/overrides.py --- 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 diff -r 424d669118d3 -r 96d335e4eacb tests/test-largefiles-misc.t --- a/tests/test-largefiles-misc.t Mon Dec 08 15:41:54 2014 -0800 +++ b/tests/test-largefiles-misc.t Sat Dec 13 13:33:48 2014 -0500 @@ -250,6 +250,16 @@ Add a normal file to the subrepo, then test archiving $ echo 'normal file' > subrepo/normal.txt + $ mv subrepo/large.txt subrepo/renamed-large.txt + $ hg -R subrepo addremove --dry-run + removing large.txt + adding normal.txt + adding renamed-large.txt + $ hg status -S + ! subrepo/large.txt + ? subrepo/normal.txt + ? subrepo/renamed-large.txt + $ mv subrepo/renamed-large.txt subrepo/large.txt $ hg -R subrepo add subrepo/normal.txt Lock in subrepo, otherwise the change isn't archived