Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

fileview: give folder depth to diff paths

Mercurial expects diffs to have a 'strip' level of 1, so we need to provide a
directory level that can be stripped. Without this hack, Mercurial's patch
routines will not apply the unified diffs we generate.

Changeset a86175eb1e02…

Parent b18285ae5a92…

by Steve Borho

Changes to one file · Browse files at a86175eb1e02 Showing diff from parent b18285ae5a92 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
698
699
700
701
 
702
703
704
 
698
699
700
 
701
702
703
704
@@ -698,7 +698,7 @@
  self.olddata = olddata   olddata = olddata.splitlines()   newdata = newdata.splitlines() - gen = difflib.unified_diff(olddata, newdata, oldname, wfile, + gen = difflib.unified_diff(olddata, newdata, 'a/'+oldname, 'b/'+wfile,   lineterm='')   data = []   if repo.ui.config('diff', 'showfunc'):