Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

commit: further named branch fixes for merges

Changeset f94055bc4b2d…

Parent 7d741735f280…

by Steve Borho

Changes to one file · Browse files at f94055bc4b2d Showing diff from parent 7d741735f280 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​commit.py Stacked
 
40
41
42
 
43
44
45
 
103
104
105
106
 
 
 
107
108
109
 
649
650
651
652
 
 
 
653
654
655
 
40
41
42
43
44
45
46
 
104
105
106
 
107
108
109
110
111
112
 
652
653
654
 
655
656
657
658
659
660
@@ -40,6 +40,7 @@
  branchcombo = gtk.combo_box_new_text()   for name in mergebranches:   branchcombo.append_text(name) + branchcombo.set_active(0)   self.vbox.pack_start(lbl, True, True, 2)   self.vbox.pack_start(branchcombo, True, True, 2)   self.connect('response', self.merge_response, branchcombo) @@ -103,7 +104,9 @@
  def merge_response(self, widget, response_id, combo):   self.closebranch = False   if response_id == gtk.RESPONSE_OK: - self.newbranch = combo.get_model()[combo.get_active()][0] + row = combo.get_active() + if row == 1: + self.newbranch = combo.get_model()[row][0]   self.destroy()     @@ -649,7 +652,9 @@
  # response: 0=Yes, 1=No, 2=Cancel   newbranch = hglib.fromutf(self.nextbranch)   if newbranch in self.repo.branchtags(): - if newbranch not in [p.branch() for p in self.repo.parents()]: + if newbranch in [p.branch() for p in self.repo.parents()]: + response = 0 + else:   response = gdialog.CustomPrompt(_('Confirm Override Branch'),   _('A branch named "%s" already exists,\n'   'override?') % self.nextbranch, self,