Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset eda3b68f0a49…

Parents 83a5518d07b8…

Parents b578bd829b1b…

by Steve Borho

Changes to 4 files · Browse files at eda3b68f0a49 Showing diff from parent 83a5518d07b8 b578bd829b1b Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​treeview.py Stacked
 
543
544
545
 
546
547
548
 
 
549
550
551
 
543
544
545
546
547
548
 
549
550
551
552
553
@@ -543,9 +543,11 @@
    def set_columns(self, columns):   if ' '.join(columns) != ' '.join(self.columns): + cols = self.treeview.get_columns()   for cn in self.columns:   c = self.tvcolumns[cn] - self.treeview.remove_column(c) + if c in cols: + self.treeview.remove_column(c)   for cn in columns:   try:   c = self.tvcolumns[cn]
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
43
44
45
46
 
47
48
49
50
51
 
52
53
54
 
43
44
45
 
46
47
48
49
50
 
51
52
53
54
@@ -43,12 +43,12 @@
  prevs = [ctx.rev() for ctx in self.repo.parents()]   if len(prevs) > 1:   rev0, rev1 = prevs - elif not rev1: + elif (not rev1 and rev1 != 0):   gdialog.Prompt(_('Unable to merge'),   _('Must supply a target revision'), self).run()   gtklib.idle_add_single_call(self.destroy)   return - elif not rev0: + elif (not rev0 and rev0 != 0):   rev0 = prevs[0]   elif rev1 == prevs[0]:   # selected pair was backwards
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​statusbar.py Stacked
 
38
39
40
41
42
 
 
43
44
45
 
75
76
77
78
79
 
 
80
81
82
 
38
39
40
 
41
42
43
44
45
46
 
76
77
78
 
79
80
81
82
83
84
@@ -38,8 +38,9 @@
    def begin(self, msg=_('Running...'), timeout=100):   self.set_text(msg) - self.pbar.map()   self.pbar.show_all() + if self.pbar.get_property('visible'): + self.pbar.map()   self.timeout_id = gobject.timeout_add(timeout, self.pulse_timer)     def end(self, msg=None, unmap=True): @@ -75,8 +76,9 @@
  label.set_text(msg)   if box.get_no_show_all():   box.set_no_show_all(False) - box.map()   box.show_all() + if box.get_property('visible'): + box.map()     def set_idle_text(self, msg):   self.idle_text = msg
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​tagadd.py Stacked
 
292
293
294
295
296
 
 
 
 
 
 
 
 
 
 
 
297
298
299
300
301
302
303
 
292
293
294
 
 
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
 
311
@@ -292,12 +292,20 @@
    def remove_hg_tag(self, name, message, local, user=None, date=None,   english=False): - if hglib.fromutf(name) not in self.repo.tags(): - raise util.Abort(_("Tag '%s' does not exist") % name) + lname = hglib.fromutf(name) + + tagtype = self.repo.tagtype(lname) + if not tagtype: + raise util.Abort(_('tag \'%s\' does not exist') % lname) + if local: + if tagtype != 'local': + raise util.Abort(_('tag \'%s\' is not a local tag') % lname) + else: + if tagtype != 'global': + raise util.Abort(_('tag \'%s\' is not a global tag') % lname)     if not message:   msgset = keep._('Removed tag %s')   message = (english and msgset['id'] or msgset['str']) % name   r = self.repo[-1].node() - lname = hglib.fromutf(name)   self.repo.tag(lname, r, hglib.fromutf(message), local, user, date)