OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed EnumFiles path/file params to unicode strings
[tortoisegit/TortoiseGitJp.git]
/
src
/
Git
/
GitStatus.cpp
diff --git
a/src/Git/GitStatus.cpp
b/src/Git/GitStatus.cpp
index
c2032a8
..
ff344e8
100644
(file)
--- a/
src/Git/GitStatus.cpp
+++ b/
src/Git/GitStatus.cpp
@@
-241,12
+241,12
@@
git_wc_status_kind GitStatus::GetAllStatus(const CTGitPath& path, git_depth_t de
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- LPCSTR lpszSubPath = NULL;
\r
- CString
A
sSubPath;
\r
+ LPC
T
STR lpszSubPath = NULL;
\r
+ CString sSubPath;
\r
CString s = path.GetWinPathString();
\r
if (s.GetLength() > sProjectRoot.GetLength())
\r
{
\r
CString s = path.GetWinPathString();
\r
if (s.GetLength() > sProjectRoot.GetLength())
\r
{
\r
- sSubPath =
CStringA(s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/)
);
\r
+ sSubPath =
s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/
);
\r
lpszSubPath = sSubPath;
\r
}
\r
\r
lpszSubPath = sSubPath;
\r
}
\r
\r
@@
-265,7
+265,7
@@
git_wc_status_kind GitStatus::GetAllStatus(const CTGitPath& path, git_depth_t de
nFlags |= WGEFF_NoRecurse;
\r
#endif
\r
\r
nFlags |= WGEFF_NoRecurse;
\r
#endif
\r
\r
- err = !wgEnumFiles(
CStringA(sProjectRoot)
, lpszSubPath, nFlags, &getallstatus, &statuskind);
\r
+ err = !wgEnumFiles(
sProjectRoot
, lpszSubPath, nFlags, &getallstatus, &statuskind);
\r
\r
/*err = git_client_status4 (&youngest,
\r
path.GetSVNApiPath(pool),
\r
\r
/*err = git_client_status4 (&youngest,
\r
path.GetSVNApiPath(pool),
\r
@@
-392,12
+392,12
@@
git_revnum_t GitStatus::GetStatus(const CTGitPath& path, bool update /* = false
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- LPCSTR lpszSubPath = NULL;
\r
- CString
A
sSubPath;
\r
+ LPC
T
STR lpszSubPath = NULL;
\r
+ CString sSubPath;
\r
CString s = path.GetWinPathString();
\r
if (s.GetLength() > sProjectRoot.GetLength())
\r
{
\r
CString s = path.GetWinPathString();
\r
if (s.GetLength() > sProjectRoot.GetLength())
\r
{
\r
- sSubPath =
CStringA(s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/)
);
\r
+ sSubPath =
s.Right(s.GetLength() - sProjectRoot.GetLength() - 1/*otherwise it gets initial slash*/
);
\r
lpszSubPath = sSubPath;
\r
}
\r
\r
lpszSubPath = sSubPath;
\r
}
\r
\r
@@
-410,7
+410,7
@@
git_revnum_t GitStatus::GetStatus(const CTGitPath& path, bool update /* = false
m_status.prop_status = m_status.text_status = git_wc_status_none;
\r
\r
// NOTE: currently wgEnumFiles will not enumerate file if it isn't versioned (so status will be git_wc_status_none)
\r
m_status.prop_status = m_status.text_status = git_wc_status_none;
\r
\r
// NOTE: currently wgEnumFiles will not enumerate file if it isn't versioned (so status will be git_wc_status_none)
\r
- m_err = !wgEnumFiles(
CStringA(sProjectRoot)
, lpszSubPath, nFlags, &getstatus, &m_status);
\r
+ m_err = !wgEnumFiles(
sProjectRoot
, lpszSubPath, nFlags, &getstatus, &m_status);
\r
\r
/*m_err = git_client_status4 (&youngest,
\r
path.GetGitApiPath(m_pool),
\r
\r
/*m_err = git_client_status4 (&youngest,
\r
path.GetGitApiPath(m_pool),
\r