Changeset 439 for cmtcvs

Timestamp:

Feb 7, 2008, 5:09:18 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 7

Location:

cmtcvs/HEAD

Files:

• ChangeLog (modified) (1 diff)
• src/cmtcvs.cxx (modified) (2 diffs)

cmtcvs/HEAD/ChangeLog

@@ +1 @@
+2008-02-07    <rybkin@lal.in2p3.fr> 7
+
+        * src/cmtcvs.cxx: To retreive the tags, consider ChangeLog
+        in the top directory first (as it is most likely changed when
+        the module is tagged and, therefore, its revision will allow us
+        to distinguish between the trunk and branches)
+        
 2008-01-15    <vincent.garonne@cern.ch> 6
 

cmtcvs/HEAD/src/cmtcvs.cxx

@@ -175 +175 @@
     /*
       #  First figure out which test file will be used to retreive the tags
+      o consider ChangeLog in the top directory first
+      (as it is most likely changed when the module is tagged and, therefore,
+      its revision will allow us to distinguish between the trunk and branches)
       #   o requirements file is considered first
       #   o then any other file in the top directory
@@ -180 +183 @@
     */
 
-  StructureType result = in_project;
+  StructureType result (no_structure);
+
+  cmt_string proj_file;
+
+  get_cvsroot (proj_file);
+  proj_file += CmtSystem::file_separator ();
+  proj_file += module;
+  proj_file += CmtSystem::file_separator ();
+  proj_file += "cmt";
+  proj_file += CmtSystem::file_separator ();
+  proj_file += "project.cmt,v";
+
+  if (CmtSystem::test_file (proj_file))
+    {
+      result = in_project;
+    }
+  else
+    {
+      result = in_package;
+    }
 
   cmt_string test_file;
-
   bool found = false;
 
   get_cvsroot (test_file);
-
   test_file += CmtSystem::file_separator ();
   test_file += module;
   test_file += CmtSystem::file_separator ();
-  test_file += "cmt";
-  test_file += CmtSystem::file_separator ();
-  test_file += "project.cmt,v";
+  test_file += "ChangeLog,v";
 
   found = CmtSystem::test_file (test_file);
+
+  if (!found && result == in_project)
+    {
+      test_file = proj_file;
+      found = true;
+    }
 
   if (!found)