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 a99542763aae

Parents 8399e15d5b7a

Parents 05ebcea58c34

by Steve Borho

Changes to 2 files · Browse files at a99542763aae Showing diff from parent 8399e15d5b7a 05ebcea58c34 Diff from another changeset...

 
321
322
323
 
324
325
326
 
437
438
439
 
440
441
442
 
321
322
323
324
325
326
327
 
438
439
440
441
442
443
444
@@ -321,6 +321,7 @@
  _('Error creating destination folder'),   _('Please specify a different path.'))   return False + self.prev_dest = None     if srcQ:   l = list(self.shist) @@ -437,6 +438,7 @@
  self.cmd.setShown(True)   self.clone_btn.setHidden(True)   self.close_btn.setHidden(True) + self.cancel_btn.setEnabled(True)   self.cancel_btn.setShown(True)   self.detail_btn.setShown(True)   self.setChoicesActive(False)
 
715
716
717
718
 
 
 
 
719
720
721
 
715
716
717
 
718
719
720
721
722
723
724
@@ -715,7 +715,10 @@
  from tortoisehg.hgqt.manifestdialog import run   if len(pats) != 1:   ui.warn(_('annotate requires a single filename\n')) - return + if pats: + pats = pats[0:] + else: + return   return qtrun(run, ui, *pats, **opts)    def init(ui, *pats, **opts):