Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

status: fix initial checking from pattern matches

Changeset 6bd05f398825…

Parent e435340ecc26…

by Steve Borho

Changes to one file · Browse files at 6bd05f398825 Showing diff from parent e435340ecc26 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
219
220
221
222
 
223
224
 
225
226
227
 
369
370
371
 
372
373
374
 
380
381
382
383
 
384
385
386
 
396
397
398
399
 
400
401
402
 
219
220
221
 
222
223
224
225
226
227
228
 
370
371
372
373
374
375
376
 
382
383
384
 
385
386
387
388
 
398
399
400
 
401
402
403
404
@@ -219,9 +219,10 @@
  lambda msg: self.emit(SIGNAL('errorMessage'), msg))   self.refreshing.start()   - def reloadComplete(self, wctx): + def reloadComplete(self, wctx, patchecked):   self.ms = merge.mergestate(self.repo)   self.wctx = wctx + self.patchecked = patchecked.copy()   self.updateModel()   self.emit(SIGNAL('loadComplete()'))   self.refreshing = None @@ -369,6 +370,7 @@
  hglib.invalidaterepo(self.repo)   extract = lambda x, y: dict(zip(x, map(y.get, x)))   stopts = extract(('unknown', 'ignored', 'clean'), self.opts) + patchecked = {}   try:   if self.pats:   m = cmdutil.match(self.repo, self.pats) @@ -380,7 +382,7 @@
  val = statusTypes[stat]   if self.opts[val.name]:   d = dict([(fn, True) for fn in status[i]]) - self.patchecked.update(d) + patchecked.update(d)   wctx = context.workingctx(self.repo, changes=status)   else:   wctx = self.repo[None] @@ -396,7 +398,7 @@
  except (OSError, IOError, util.Abort, error.ConfigError), e:   err = hglib.tounicode(e)   self.emit(SIGNAL('errorMessage'), QString(err)) - self.emit(SIGNAL('finished'), wctx) + self.emit(SIGNAL('finished'), wctx, patchecked)      class WctxFileTree(QTreeView):