Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.1, 0.8.2, and 0.8.3

status: non-glob-safe filenames also affected status/commit/etc

Use cmdutil.matchfiles() to avoid glob lookups when generating diffs. This
appears to be safe even when operating in subdirectories, but this will need
some testing inside the full installer. Again, avoid globs is a performance
improvement in any case.

Refs #363

Changeset a06df354a37f…

Parent 15b7759ade82…

by Steve Borho

Changes to one file · Browse files at a06df354a37f Showing diff from parent 15b7759ade82 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
846
847
848
849
850
851
852
 
853
854
855
 
916
917
918
919
920
 
921
922
923
 
846
847
848
 
849
850
 
851
852
853
854
 
915
916
917
 
 
918
919
920
921
@@ -846,10 +846,9 @@
  return   wfile = self.filemodel[paths[0]][FM_PATH]   difftext = [_('===== Diff to first parent =====\n')] - wfiles = [self.repo.wjoin(wfile)]   wctx = self.repo[None]   pctxs = wctx.parents() - matcher = cmdutil.match(self.repo, wfiles, self.opts) + matcher = cmdutil.matchfiles(self.repo, [wfile])   for s in patch.diff(self.repo, pctxs[0].node(), None,   match=matcher, opts=patch.diffopts(self.ui, self.opts)):   difftext.extend(s.splitlines(True)) @@ -916,8 +915,7 @@
  difftext.writelines(lines)   difftext.seek(0)   else: - wfiles = [self.repo.wjoin(wfile)] - matcher = cmdutil.match(self.repo, wfiles, self.opts) + matcher = cmdutil.matchfiles(self.repo, [wfile])   diffopts = mdiff.diffopts(git=True, nodates=True)   for s in patch.diff(self.repo, self._node1, self._node2,   match=matcher, opts=diffopts):