search

guberm / tortoisegit

Automatically exported from code.google.com/p/tortoisegit
0 stars 0 forks source link

diff not using clean/smudge filter #2461

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
When typing git diff MyIPythonNotebook.ipynb in Git bash I get no differences 
ie. it is using the clean filter I have defined. TGMerge (or KDiff3 if I set 
that as the diff viewer) both show lots of differences that exist if the clean 
filter is not run.

The clean filter is set up as follows:
.git/config:
[filter "stripoutput"]
    clean = PATHTOREPO/ipynb_output_filter.py
    smudge = cat
    required = true
.gitattributes:
*.ipynb filter=stripoutput

The filter itself is attached and is for iPython notebooks stripping output 
stuff from them as per the discussion here: 
https://gist.github.com/minrk/6176788.

It could be that this issue which was fixed has been accidentally unfixed:
https://code.google.com/p/tortoisegit/issues/detail?id=1596

Versions:
TortoiseGit 1.8.13.0 (C:\Program Files\TortoiseGit\bin) 
git version 1.9.5.msysgit.0 (C:\Program Files (x86)\Git\bin)

Original issue reported on code.google.com by rans1...@gmail.com on 16 Mar 2015 at 12:55

Attachments:

GoogleCodeExporter commented 9 years ago 
Furthermore, there is a strange error message when attempting to commit a file 
where the clean filter successfully removes the notebook output leaving no 
actual differences. The error is: "fatal: Unable to create 
'MYREPO/.git/index.lock': File exists" as in the attached picture.

If there are actual differences after the clean filter has run (on commit), 
then the commit works as normal.

Original comment by rans1...@gmail.com on 16 Mar 2015 at 1:15

Attachments:

GoogleCodeExporter commented 9 years ago 
Can you please check using the Debug String 
(https://code.google.com/p/tortoisegit/wiki/HOWTO_Debug) and maybe ProcMon 
whether the filter gets called?

Original comment by sstrickr...@googlemail.com on 17 Mar 2015 at 7:33

GoogleCodeExporter commented 9 years ago 
I tried both of those tools when running Tortoise diff and I cannot see any 
output which suggests that the filter is being called.

Original comment by rans1...@gmail.com on 18 Mar 2015 at 1:24

GoogleCodeExporter commented 9 years ago 
Can you mail me the logs?

Original comment by sstrickr...@googlemail.com on 18 Mar 2015 at 1:25

GoogleCodeExporter commented 9 years ago 
Please see attached debugview.LOG which does not seem to have much
information in it. I committed an IPython notebook file and made a small
change in it. Then I loaded debugview, right clicked on the file and
launched Tortoise diff. I then saved the log.

Original comment by rans1...@gmail.com on 18 Mar 2015 at 2:55

GoogleCodeExporter commented 9 years ago 
There are not attachments. Btw. please start debugview before starting 
tortoisegit

Original comment by sstrickr...@googlemail.com on 18 Mar 2015 at 2:59

GoogleCodeExporter commented 9 years ago 
I'm not sure what you mean about starting debugview before TortoiseGit - I
can only launch TortoiseGit from my right click menu from which I choose
Git Diff after having loaded debugview - is that what you meant?.  The log
of that is below:

00000001 0.00000000 [8760] CShellExt::Initialize_Wrap: Shell :: Initialize
00000002 0.00159730 [8760] CShellExt::QueryContextMenu_Wrap: Shell ::
QueryContextMenu itemStates=261
00000003 0.03684065 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Commit...
00000004 0.03695238 [8760] CShellExt::GetCommandString_Wrap: verb : Git Diff
00000005 0.03704870 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Show log
00000006 0.03718570 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Check for modifications
00000007 0.03724057 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Stash Save
00000008 0.03735348 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Commit...
00000009 0.03745928 [8760] CShellExt::GetCommandString_Wrap: verb : Git Diff
00000010 0.03754969 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Show log
00000011 0.03767642 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Check for modifications
00000012 0.03776564 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Stash Save
00000013 0.03782920 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Commit...
00000014 0.03784578 [8760] CShellExt::GetCommandString_Wrap: verb : Git Diff
00000015 0.03789631 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Show log
00000016 0.03792237 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Check for modifications
00000017 0.03795869 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Stash Save
00000018 0.03802698 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Commit...
00000019 0.03806252 [8760] CShellExt::GetCommandString_Wrap: verb : Git Diff
00000020 0.03809844 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Show log
00000021 0.03813713 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Check for modifications
00000022 0.03817424 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Stash Save
00000023 0.03824293 [8760] CShellExt::GetCommandString_Wrap: verb : Git Diff
00000024 0.03828004 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Show log
00000025 0.03831715 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Check for modifications
00000026 0.03835268 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Stash Save
00000027 0.03842059 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Show log
00000028 0.03845691 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Check for modifications
00000029 0.03849283 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Stash Save
00000030 0.03856390 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Check for modifications
00000031 0.03860021 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Stash Save
00000032 0.03866812 [8760] CShellExt::GetCommandString_Wrap: verb : Git
Stash Save
00000033 3.06155658 [8760] CShellExt::GetCommandString_Wrap: verb : Git Diff
00000034 3.15967798 [3436] CGit::CheckMsysGitDir: CheckMsysGitDir(1)
00000035 3.16042399 [3436] CGit::CheckMsysGitDir: ms_LastMsysGitDir =
C:\Program Files (x86)\Git\bin
00000036 3.16148758 [3436] CTortoiseProcApp::CTortoiseProcApp: Constructor
00000037 3.19036818 [3436] CTortoiseProcApp::InitInstance: InitInstance
00000038 3.19040251 [3436] CTortoiseProcApp::CheckUpgrade: Current TGit
Version 1.8.13.0
00000039 3.19280648 [3436] CTortoiseProcApp::InitInstance: Set Help
Filename C:\Program Files\TortoiseGit\bin\TortoiseGit_en.chm
00000040 3.19308877 [3436] CTortoiseProcApp::InitInstance: Registering
Crash Report ...
00000041 3.19311476 [3436] CTortoiseProcApp::InitInstance: Initializing UI
components ...
00000042 3.26049328 [3436] SendCacheCommand: Could not connect to pipe
00000043 3.26568031 [8760] ShellCache::IsPathAllowed: GetDriveType for C:\,
Drive 2
00000044 3.28116226 [3436] CGit::RunAsync: executing "C:\Program Files
(x86)\Git\bin\git.exe" update-index -- "Untitled.ipynb"
00000045 4.10801840 [3436] CGit::Run: process exited: 0
00000046 4.13955450 [3436] SendCacheCommand: Could not connect to pipe
00000047 4.16960621 [3436] SendCacheCommand: Could not connect to pipe
00000048 4.19959736 [3436] SendCacheCommand: Could not connect to pipe
00000049 4.44896841 [9544] CGit::CheckMsysGitDir: CheckMsysGitDir(1)
00000050 4.44968271 [9544] CGit::CheckMsysGitDir: ms_LastMsysGitDir =
C:\Program Files (x86)\Git\bin
00000051 24.09031677 [4316] CGit::CheckMsysGitDir: CheckMsysGitDir(1)
00000052 24.09084511 [4316] ShellCache::IsPathAllowed: GetDriveType for
C:\, Drive 2
00000053 24.09154320 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\GitHub
00000054 24.09218597 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Fiddler2
00000055 24.09267616 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Attachmate
00000056 24.09306717 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\IPython Notebooks
00000057 24.09368134 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\Logishrd
00000058 24.09550285 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Documents.library-ms
00000059 24.09669495 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Git.library-ms
00000060 24.09720230 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Pictures.library-ms
00000061 24.09759331 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\GitHub
00000062 24.09796143 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Fiddler2
00000063 24.09836006 [4316] SNACNP::NPGetCaps::WNNC_NET_TYPE
00000064 24.09873009 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\IPython Notebooks
00000065 24.09926224 [4316] SNACNP::NPGetCaps::WNNC_USER
00000066 24.09988022 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Documents.library-ms
00000067 24.10110855 [4316] SNACNP::NPGetCaps::WNNC_CONNECTION
00000068 24.10153580 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Music.library-ms
00000069 24.10215759 [4316] SNACNP::NPGetCaps::WNNC_ENUMERATION
00000070 24.10254288 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Videos.library-ms
00000071 24.10362053 [4316] SNACNP::NPGetCaps::WNNC_ADMIN
00000072 24.10447693 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Pictures.library-ms
00000073 24.10505295 [4316] SNACNP::NPGetCaps::WNNC_DIALOG
00000074 24.10546684 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\My Videos
00000075 24.10610008 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Documents.library-ms
00000076 24.10676193 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Videos.library-ms
00000077 24.10790443 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Fiddler2
00000078 24.10869789 [4316] SNACNP::NPGetCaps::WNNC_START
00000079 24.10958099 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\My Received Files
00000080 24.11044502 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Documents.library-ms
00000081 24.11119652 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Videos.library-ms
00000082 24.11177444 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Fiddler2
00000083 24.11225128 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\My Pictures
00000084 24.11293983 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Documents.library-ms
00000085 24.11344528 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Videos.library-ms
00000086 24.11398315 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\My Pictures
00000087 24.11446762 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\AppData\Roaming\Microsoft\Windows\Libraries\Videos.library-ms
00000088 24.11495590 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\My Pictures
00000089 24.11544418 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\My Music
00000090 24.11592102 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\My Music
00000091 24.11642647 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\MATLAB
00000092 24.38833618 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\My Videos
00000093 24.39056587 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Nordea
00000094 24.39167595 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\NetBeansProjects
00000095 24.39275169 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\My Videos
00000096 24.39372444 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\pgadmin.log
00000097 24.39474106 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\
00000098 24.39572334 [4316] ShellCache::IsPathAllowed: GetDriveType for
H:\, Drive 7
00000099 24.89241028 [4316] ShellCache::IsPathAllowed: GetDriveType for
I:\, Drive 8
00000100 24.89348030 [4316] ShellCache::IsPathAllowed: GetDriveType for
Q:\, Drive 16
00000101 25.40385246 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Nordea
00000102 25.40582085 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\gitscc.log
00000103 25.40684700 [4316] ShellCache::IsPathAllowed: GetDriveType for
R:\, Drive 17
00000104 25.90685272 [4316] ShellCache::IsPathAllowed: GetDriveType for
P:\, Drive 15
00000105 25.90861511 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Nordea
00000106 25.90963554 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\debugview.LOG
00000107 25.91063309 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Visual Studio 2010
00000108 25.91181946 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Visual Studio 2008
00000109 25.91307640 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Screen Video
00000110 25.91413116 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Python Scripts
00000111 25.91511154 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Personal
00000112 25.91605186 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Outlook Files
00000113 25.91707039 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Office 2010 Getting started
00000114 27.99927521 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Attachmate
00000115 27.99983406 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Fiddler2
00000116 28.00063896 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\GitHub
00000117 28.00126457 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\IPython Notebooks
00000118 28.00256348 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\Logishrd
00000119 28.00317955 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\MATLAB
00000120 28.00391197 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\My Videos
00000121 28.00532722 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\Logishrd
00000122 28.00623512 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\My Videos
00000123 28.00786209 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\Logishrd
00000124 28.00910378 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\My Received Files
00000125 28.01052475 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\My Pictures
00000126 28.01168633 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\My Pictures
00000127 28.01271629 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\My Music
00000128 28.01338959 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\My Music
00000129 28.44609642 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\Public\Documents\My Videos
00000130 28.44779015 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\NetBeansProjects
00000131 28.44898415 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Nordea
00000132 28.44998741 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Office 2010 Getting started
00000133 28.45098877 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\pgadmin.log
00000134 28.45219994 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\NetBeansProjects
00000135 28.45317841 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\gitscc.log
00000136 28.45413208 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\debugview.LOG
00000137 28.45512009 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Visual Studio 2010
00000138 28.45612526 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Visual Studio 2008
00000139 28.45715141 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Screen Video
00000140 28.45857620 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Python Scripts
00000141 28.46055031 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Personal
00000142 28.46182632 [4316] CShellExt::IsMemberOf_Wrap: Status 0 for file
C:\Users\G46588\Documents\Outlook Files

Original comment by rans1...@gmail.com on 18 Mar 2015 at 3:09

GoogleCodeExporter commented 9 years ago 
Did you disable libgit2?

Original comment by sstrickr...@googlemail.com on 21 Mar 2015 at 2:37

GoogleCodeExporter commented 9 years ago 
I just added some (automatic) tests and clean/smudge filters are working: see 
https://code.google.com/p/tortoisegit/source/detail?r=a8c958b19e22aed99290aa7507
23a5b2c936320b and 
https://ci.appveyor.com/project/SvenStrickroth/tortoisegit/build/master.105

Original comment by sstrickr...@googlemail.com on 22 Mar 2015 at 2:07

GoogleCodeExporter commented 9 years ago 
Can you provide a small demo repository?

Original comment by sstrickr...@googlemail.com on 30 Mar 2015 at 1:05

GoogleCodeExporter commented 9 years ago 
No response for a long time. Please provide the requested information if this 
issue is still valid for you.

Original comment by sstrickr...@googlemail.com on 18 Apr 2015 at 4:01