Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable update: check subrepo dirty status before update --clean (fixes #393)

Changeset 394b28f582eb…

Parent 0552c995fdff…

by Steve Borho

Changes to one file · Browse files at 394b28f582eb Showing diff from parent 0552c995fdff Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
196
197
198
199
 
 
 
 
 
 
200
201
202
 
196
197
198
 
199
200
201
202
203
204
205
206
207
@@ -196,7 +196,12 @@
  def isclean():   '''whether WD is changed'''   wc = self.repo[None] - return not (wc.modified() or wc.added() or wc.removed()) + if wc.modified() or wc.added() or wc.removed(): + return False + for s in wc.substate: + if wc.sub(s).dirty(): + return False + return True   def ismergedchange():   '''whether the local changes are merged (have 2 parents)'''   wc = self.repo[None]