comparison hgext/largefiles/overrides.py @ 23602:a4679a74df14

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 18 Dec 2014 16:41:59 -0600
parents a2f139d25845 96d335e4eacb
children bbd50e13c006
comparison
equal deleted inserted replaced
23591:414374cfb531 23602:a4679a74df14
189 if not after: 189 if not after:
190 # If this is being called by addremove, notify the user that we 190 # If this is being called by addremove, notify the user that we
191 # are removing the file. 191 # are removing the file.
192 if isaddremove: 192 if isaddremove:
193 ui.status(_('removing %s\n') % f) 193 ui.status(_('removing %s\n') % f)
194 util.unlinkpath(repo.wjoin(f), ignoremissing=True) 194
195 lfdirstate.remove(f) 195 if not opts.get('dry_run'):
196 if not after:
197 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
198 lfdirstate.remove(f)
199
200 if opts.get('dry_run'):
201 return result
202
196 lfdirstate.write() 203 lfdirstate.write()
197 remove = [lfutil.standin(f) for f in remove] 204 remove = [lfutil.standin(f) for f in remove]
198 # If this is being called by addremove, let the original addremove 205 # If this is being called by addremove, let the original addremove
199 # function handle this. 206 # function handle this.
200 if not isaddremove: 207 if not isaddremove: