Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek Merge with stable

Changeset e8e7e1fd99ea…

Parents eacaa46c6eae…

Parents 89f3d717e0f1…

by David Golub

Changes to 3 files · Browse files at e8e7e1fd99ea Showing diff from parent eacaa46c6eae 89f3d717e0f1 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
 
333
334
335
 
 
336
337
338
 
333
334
335
336
337
338
339
340
@@ -333,6 +333,8 @@
  isbfile = True   res = self.checkMaxDiff(ctx, wfile, maxdiff)   if res is None: + if status == 'A': + self.flabel += _(' <i>(was added)</i>')   return   fctx, newdata = res   self.contents = newdata
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​shelve.py Stacked
 
265
266
267
268
 
 
269
270
271
 
265
266
267
 
268
269
270
271
272
@@ -265,7 +265,8 @@
  qtlib.ErrorMsgBox(_('File already exists'),   _('A shelf file of that name already exists'))   return - self.repo.opener(fn, 'wb').write('') + f = open(shelfpath, "wb") + f.close()   self.showMessage(_('New shelf created'))   self.refreshCombos()   if shelfpath in self.shelves:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
470
471
472
473
 
474
 
 
475
476
477
 
470
471
472
 
473
474
475
476
477
478
479
@@ -470,8 +470,10 @@
  if os.path.isdir(sdir):   def getModificationTime(x):   return os.path.getmtime(os.path.join(sdir, x)) - return sorted(os.listdir(sdir), + shelves = sorted(os.listdir(sdir),   key=getModificationTime, reverse=True) + return [s for s in shelves if \ + os.path.isfile(os.path.join(self.shelfdir, s))]   return []     def thginvalidate(self):