Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

rename: consider 'A' added as targets and 'R' as sources

If the user ran 'hg addremove', then ran 'hgtk guess' it will
now still work correctly.

Changeset 14ed9d8ccd91…

Parent 96159d84a2cc…

by Steve Borho

Changes to one file · Browse files at 14ed9d8ccd91 Showing diff from parent 96159d84a2cc Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​rename.py Stacked
 
161
162
163
164
 
 
 
 
 
165
166
167
 
196
197
198
199
 
200
201
202
 
161
162
163
 
164
165
166
167
168
169
170
171
 
200
201
202
 
203
204
205
206
@@ -161,7 +161,11 @@
  match=matcher, ignored=False, clean=False, unknown=True)   (modified, added, removed, deleted, unknown, ignored, clean) = status   unkmodel.clear() - for u in unknown: unkmodel.append( [u] ) + for u in unknown: + unkmodel.append( [u] ) + for a in added: + if not repo.dirstate.copied(a): + unkmodel.append( [a] )   self.deleted = deleted     def save_settings(self, w, event, settings, hpaned, vpaned, adjustment): @@ -196,7 +200,7 @@
  except:   good = False   status = repo.dirstate[abs] - if status != 'r' and (not good or not util.lexists(target) + if (not good or not util.lexists(target)   or (os.path.isdir(target) and not os.path.islink(target))):   srcs.append(abs)   elif not adj and status == 'n':