Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek Merge with stable

Changeset 554daff290c0…

Parents 605b3738664e…

Parents d4016fbb0777…

by David Golub

Changes to 5 files · Browse files at 554daff290c0 Showing diff from parent 605b3738664e d4016fbb0777 Diff from another changeset...

Change 1 of 1 Show Entire File INSTALL.txt Stacked
 
9
10
11
12
 
 
9
10
11
 
12
@@ -9,4 +9,4 @@
   For source install details, see:   -http://bitbucket.org/tortoisehg/thg/wiki/developers/Hacking +https://bitbucket.org/tortoisehg/thg/wiki/developers/Home
Change 1 of 2 Show Entire File contrib/​nautilus-thg.py Stacked
 
57
58
59
 
 
60
61
62
 
373
374
375
376
377
 
 
378
379
380
 
 
 
57
58
59
60
61
62
63
64
 
375
376
377
 
 
378
379
380
 
 
381
382
@@ -57,6 +57,8 @@
 else:   debugf = debugthg.debugf_No   +# avoid breaking other Python nautilus extensions +demandimport.disable()    nofilecmds = 'about serve synch repoconfig userconfig merge unmerge'.split()   @@ -373,8 +375,8 @@
  return True    if ui.ui().configbool("tortoisehg", "overlayicons", default = True): - class HgExtension(HgExtensionIcons, nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.PropertyPageProvider, nautilus.InfoProvider): - pass + class HgExtension(HgExtensionIcons, nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.PropertyPageProvider, nautilus.InfoProvider): + pass  else: - class HgExtension(HgExtensionDefault, nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.PropertyPageProvider): - pass + class HgExtension(HgExtensionDefault, nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.PropertyPageProvider): + pass
Change 1 of 5 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
288
289
290
 
291
292
293
 
527
528
529
 
530
531
532
 
629
630
631
632
 
633
634
635
 
646
647
648
649
 
650
651
652
 
654
655
656
657
 
658
659
660
 
288
289
290
291
292
293
294
 
528
529
530
531
532
533
534
 
631
632
633
 
634
635
636
637
 
648
649
650
 
651
652
653
654
 
656
657
658
 
659
660
661
662
@@ -288,6 +288,7 @@
    self.tv.setSortingEnabled(False)   self.tv.pattern = pattern + self.tv.icase = icase   self.regexple.selectAll()   inc = hglib.fromunicode(self.incle.text())   if inc: inc = inc.split(', ') @@ -527,6 +528,7 @@
    self.repo = repo   self.pattern = None + self.icase = False   self.embedded = parent.parent() is not None   self.selectedRows = ()   @@ -629,7 +631,7 @@
  def onAnnotateFile(self):   from tortoisehg.hgqt.manifestdialog import run   from tortoisehg.hgqt.run import qtrun - repo, ui, pattern = self.repo, self.repo.ui, self.pattern + repo, ui, pattern, icase = self.repo, self.repo.ui, self.pattern, self.icase   seen = set()   for rev, path, line in self.selectedRows:   # Only open one annotate instance per file @@ -646,7 +648,7 @@
  rev = repo['.'].rev()   srepo = thgrepo.repository(None, root)   opts = {'repo': srepo, 'canonpath' : path, 'rev' : rev, - 'line': line, 'pattern': pattern} + 'line': line, 'pattern': pattern, 'ignorecase': icase}   qtrun(run, ui, **opts)   else:   continue @@ -654,7 +656,7 @@
  if rev is None:   rev = repo['.'].rev()   opts = {'repo': repo, 'canonpath' : path, 'rev' : rev, - 'line': line, 'pattern': pattern} + 'line': line, 'pattern': pattern, 'ignorecase': icase}   qtrun(run, ui, **opts)     def onViewChangeset(self):
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
79
80
81
 
 
 
 
82
83
84
 
537
538
539
 
540
541
542
 
79
80
81
82
83
84
85
86
87
88
 
541
542
543
544
545
546
547
@@ -79,6 +79,10 @@
  """Set search pattern [unicode]"""   self._manifest_widget._fileview.searchbar.setPattern(text)   + def setSearchCaseInsensitive(self, ignorecase): + """Set if search is case insensitive""" + self._manifest_widget._fileview.searchbar.setCaseInsensitive(ignorecase) +   @pyqtSlot(unicode, dict)   def _openSearchWidget(self, pattern, opts):   opts = dict((str(k), str(v)) for k, v in opts.iteritems()) @@ -537,6 +541,7 @@
  dlg.setSearchPattern(opts['pattern'])   if dlg._manifest_widget._fileview.actionAnnMode.isEnabled():   dlg._manifest_widget._fileview.actionAnnMode.trigger() + dlg.setSearchCaseInsensitive(opts['ignorecase'])   except IndexError:   pass   dlg.setSearchPattern(hglib.tounicode(opts.get('pattern')) or '')
Change 1 of 2 Show Entire File win32/​shellext/​CShellExtDnd.cpp Stacked
 
71
72
73
74
 
75
76
77
 
126
127
128
129
 
130
131
132
 
71
72
73
 
74
75
76
77
 
126
127
128
 
129
130
131
132
@@ -71,7 +71,7 @@
 void CShellExtDnd::RunDialog(const CString& cmd)  {   if (cmd == "drag_move" || cmd == "drag_copy") { - //Append the current directory as the dest + //Append the current directory as the dest   myFiles.Add(myFolder);   }   CShellExtCMenuBase::RunDialog(cmd); @@ -126,7 +126,7 @@
  ATLTRACE(" '%s' isn't in target dir repository\n", name);   myFiles.RemoveAll();   break; - } + }   myFiles.Add(name);   }   }