Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset 67d9c1223260

Parents 01ac84adabb0

Parents 2db0a470f64f

by Steve Borho

Changes to 2 files · Browse files at 67d9c1223260 Showing diff from parent 01ac84adabb0 2db0a470f64f Diff from another changeset...

 
272
273
274
275
 
276
277
278
 
272
273
274
 
275
276
277
278
@@ -272,7 +272,7 @@
  user = self.opts['user'] or os.environ.get('HGUSER') or \   self.repo.ui.config('ui', 'username')   if user: - update_recent_committers(hglib.toutf(user)) + self.update_recent_committers(hglib.toutf(user))   if not self.autoinc_entry.get_text():   autoinc = self.repo.ui.config('tortoisehg', 'autoinc', '')   self.autoinc_entry.set_text(hglib.toutf(autoinc))
 
59
60
61
62
 
63
64
65
 
59
60
61
 
62
63
64
65
@@ -59,7 +59,7 @@
  self.tagrevs = [repo[r].rev() for t, r in repo.tagslist()]   self.branchtags = repo.branchtags()   self.wcparents = [x.rev() for x in repo.parents()] - except hglib.Abort: + except util.Abort:   pass     def refresh(self):