Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 9c9ce6453f1e…

Parents 8765460b7cf9…

Parents 372effa4384b…

by Steve Borho

Changes to 2 files · Browse files at 9c9ce6453f1e Showing diff from parent 8765460b7cf9 372effa4384b Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​archive.py Stacked
 
134
135
136
137
138
139
140
141
 
142
143
144
 
235
236
237
238
 
239
240
241
 
242
243
244
 
134
135
136
 
137
138
139
140
141
142
143
144
 
235
236
237
 
238
239
240
 
241
242
243
244
@@ -134,11 +134,11 @@
  tags.reverse()   for t in tags:   self.rev_combo.addItem(t) - self.rev_combo.setMaxVisibleItems(self.rev_combo.count())   if self.initrev:   text = str(self.initrev)   if self.rev_combo.findText(text, Qt.MatchFlags(Qt.MatchExactly)) == -1:   self.rev_combo.insertItems(0, [text]) + self.rev_combo.setMaxVisibleItems(self.rev_combo.count())   self.rev_combo.setCurrentIndex(0)   self.subrepos_chk.setChecked(self.get_subrepos_present())   self.dest_edit.setText(self.repo.root) @@ -235,10 +235,10 @@
  'label': _('Gzip tar archives')}   elif self.uzipradio.isChecked():   return {'type': 'uzip', 'ext': '.zip', - 'label': ('Uncompressed zip archives')} + 'label': _('Zip archives')}   elif self.zipradio.isChecked():   return {'type': 'zip', 'ext': '.zip', - 'label': _('Compressed zip archives')} + 'label': _('Zip archives')}   return {'type': 'files', 'ext': '', 'label': _('Directory of files')}     def update_path(self):
Change 1 of 2 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
476
477
478
479
480
481
482
483
484
485
 
 
 
 
 
 
 
 
 
486
487
488
 
502
503
504
505
 
506
507
508
 
476
477
478
 
 
 
 
 
 
 
479
480
481
482
483
484
485
486
487
488
489
490
 
504
505
506
 
507
508
509
510
@@ -476,13 +476,15 @@
 def utctime(date):   return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(date[0]))   -agescales = [((lambda n: ngettext("%d year", "%d years", n)), 3600 * 24 * 365), - ((lambda n: ngettext("%d month", "%d months", n)), 3600 * 24 * 30), - ((lambda n: ngettext("%d week", "%d weeks", n)), 3600 * 24 * 7), - ((lambda n: ngettext("%d day", "%d days", n)), 3600 * 24), - ((lambda n: ngettext("%d hour", "%d hours", n)), 3600), - ((lambda n: ngettext("%d minute", "%d minutes", n)), 60), - ((lambda n: ngettext("%d second", "%d seconds", n)), 1)] +agescales = [ + ((lambda n: ngettext("%d year ago", "%d years ago", n)), 3600 * 24 * 365), + ((lambda n: ngettext("%d month ago", "%d months ago", n)), 3600 * 24 * 30), + ((lambda n: ngettext("%d week ago", "%d weeks ago", n)), 3600 * 24 * 7), + ((lambda n: ngettext("%d day ago", "%d days ago", n)), 3600 * 24), + ((lambda n: ngettext("%d hour ago", "%d hours ago", n)), 3600), + ((lambda n: ngettext("%d minute ago", "%d minutes ago", n)), 60), + ((lambda n: ngettext("%d second ago", "%d seconds ago", n)), 1), + ]    def age(date):   '''turn a (timestamp, tzoff) tuple into an age string.''' @@ -502,7 +504,7 @@
  for t, s in agescales:   n = delta // s   if n >= 2 or s == 1: - return _('%s ago') % (t(n) % n) + return t(n) % n    def username(user):   author = templatefilters.person(user)