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

merge with crew

Changeset 77acf8df275e…

Parents 9767c36b5bfd…

Parents e47ed9bcdf5d…

by Adrian Buehlmann

Changes to one file · Browse files at 77acf8df275e Showing diff from parent 9767c36b5bfd e47ed9bcdf5d Diff from another changeset...

Change 1 of 2 Show Entire File win32/​shellext/​DirectoryStatus.cpp Stacked
 
20
21
22
23
 
24
25
26
27
28
 
 
29
30
31
32
 
 
33
34
35
 
83
84
85
 
86
87
88
 
20
21
22
 
23
24
25
26
27
28
29
30
31
32
33
 
34
35
36
37
38
 
86
87
88
89
90
91
92
@@ -20,16 +20,19 @@
 #include "Thgstatus.h"     -char DirectoryStatus::status(const std::string& relpath) const +char DirectoryStatus::status(const std::string& relpath_) const  {   char res = 'C';   bool added = false;   bool modified = false;   + const std::string relpath = relpath_ + '/'; +   for (V::const_iterator i = v_.begin(); i != v_.end(); ++i)   {   const E& e = *i; - if (e.path_.compare(0, relpath.length(), relpath) == 0) + if (relpath_.empty() || + e.path_.compare(0, relpath.length(), relpath) == 0)   {   if (e.status_ == 'm' || e.status_ == 'r')   { @@ -83,6 +86,7 @@
  if (path.size() > 1000)   return 0;   } + path.push_back('/');   path.push_back(0);     e.path_ = &path[0];