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

tagadd: convert to/from local encoding

Changeset c6162e656bd8…

Parent 04a2e4dc29ff…

by Yuki KODAMA

Changes to one file · Browse files at c6162e656bd8 Showing diff from parent 04a2e4dc29ff Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​tagadd.py Stacked
 
50
51
52
53
 
54
55
56
 
102
103
104
105
 
106
107
108
 
226
227
228
229
 
230
231
232
 
239
240
241
242
 
 
243
244
245
246
 
247
248
249
250
251
252
253
 
 
 
50
51
52
 
53
54
55
56
 
102
103
104
 
105
106
107
108
 
226
227
228
 
229
230
231
232
 
239
240
241
 
242
243
244
245
246
 
247
248
249
250
251
252
253
 
254
255
@@ -50,7 +50,7 @@
  ## tag name input   self.tagcombo = gtk.combo_box_entry_new_text()   self.tagentry = self.tagcombo.get_child() - self.tagentry.set_text(tag) + self.tagentry.set_text(hglib.toutf(tag))   self.tagentry.connect('activate',   lambda *a: self.response(RESPONSE_ADD))   table.add_row(_('Tag:'), self.tagcombo, padding=False) @@ -102,7 +102,7 @@
  for tagname in tags:   if tagname == 'tip':   continue - self.tagcombo.append_text(tagname) + self.tagcombo.append_text(hglib.toutf(tagname))     # clear tag input   if clear: @@ -226,7 +226,7 @@
    def _add_hg_tag(self, name, revision, message, local, user=None,   date=None, force=False, english=False): - if name in self.repo.tags() and not force: + if hglib.fromutf(name) in self.repo.tags() and not force:   raise util.Abort(_('a tag named "%s" already exists') % name)     ctx = self.repo[revision] @@ -239,15 +239,17 @@
  if name in self.repo.tags() and not force:   raise util.Abort(_("Tag '%s' already exist") % name)   - self.repo.tag(name, r, hglib.fromutf(message), local, user, date) + lname = hglib.fromutf(name) + self.repo.tag(lname, r, hglib.fromutf(message), local, user, date)     def _remove_hg_tag(self, name, message, local, user=None, date=None,   english=False): - if not name in self.repo.tags(): + if hglib.fromutf(name) not in self.repo.tags():   raise util.Abort(_("Tag '%s' does not exist") % name)     if not message:   msgset = keep._('Removed tag %s')   message = (english and msgset['id'] or msgset['str']) % name   r = self.repo[-1].node() - self.repo.tag(name, r, message, local, user, date) + lname = hglib.fromutf(name) + self.repo.tag(lname, r, hglib.fromutf(message), local, user, date)