Kiln » largefiles » Unity
Clone URL:  

override_add: minor readability changes

Changeset 9818ca264760…

Parent 381fe7fc79fc…

by Profile picture of User 521Andrew Pritchard <andrewp@fogcreek.com>

Changes to one file · Browse files at 9818ca264760 Showing diff from parent 381fe7fc79fc Diff from another changeset...

Change 1 of 1 Show Entire File overrides.py Stacked
 
110
111
112
 
113
114
115
116
117
118
119
 
 
 
120
121
 
 
122
123
124
 
110
111
112
113
114
 
 
 
115
116
 
117
118
119
120
 
121
122
123
124
125
@@ -110,15 +110,16 @@
  exact = m.exact(f)   lfile = lfutil.standin(f) in wctx   nfile = f in wctx + exists = lfile or nfile   - if exact and lfile: - ui.warn(_('%s already a largefile\n') % f) - continue   # Don't warn the user when they attempt to add a normal tracked file.   # The normal add code will do that for us. - if exact and nfile: + if exact and exists: + if lfile: + ui.warn(_('%s already a largefile\n') % f)   continue - if exact or (not lfile and not nfile): + + if exact or not exists:   if large or (lfsize and os.path.getsize(repo.wjoin(f)) >= \   lfsize * 1024 * 1024) or (lfmatcher and lfmatcher(f)):   lfnames.append(f)