Fixed issue #933: implement git stash --include-untracked
[TortoiseGit.git] / src / TortoiseProc / GitDiff.h
blob7fe95d5e37d9d31532d0b9cdcdc015d63a2ba3ec
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2011 - TortoiseGit
5 // This program is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU General Public License
7 // as published by the Free Software Foundation; either version 2
8 // of the License, or (at your option) any later version.
10 // This program is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 // GNU General Public License for more details.
15 // You should have received a copy of the GNU General Public License
16 // along with this program; if not, write to the Free Software Foundation,
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20 #pragma once
21 #include "TGitPath.h"
22 #include "GitStatus.h"
23 #include "Git.h"
25 class CGitDiff
27 public:
28 CGitDiff(void);
29 ~CGitDiff(void);
30 static int Parser(git_revnum_t &rev);
32 // Use two path to handle rename cases
33 static int Diff(CTGitPath * pPath1, CTGitPath *pPath2 ,git_revnum_t rev1, git_revnum_t rev2, bool blame=false, bool unified=false);
34 static int SubmoduleDiff(CTGitPath * pPath1, CTGitPath *pPath2 ,git_revnum_t rev1, git_revnum_t rev2, bool blame=false, bool unified=false);
35 static int DiffNull(CTGitPath *pPath, git_revnum_t rev1,bool bIsAdd=true);
36 static int DiffCommit(CTGitPath &path, GitRev *r1, GitRev *r2);
37 static int DiffCommit(CTGitPath &path, CString r1, CString r2);
38 static int SubmoduleDiffNull(CTGitPath *pPath1,git_revnum_t &rev1);