Mercurial > gnulib

changeset 39127:0b61ec42194b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pygnulib: fix transformations of CVS paths
author Dmitry Selyutin <ghostmansd@gmail.com>
date Wed, 04 Jul 2018 10:19:24 +0300
parents 01534b9b9e73
children d3904b5d6bfd
files pygnulib.py
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/pygnulib.py	Tue Jul 03 23:29:58 2018 +0300
+++ b/pygnulib.py	Wed Jul 04 10:19:24 2018 +0300
@@ -593,28 +593,27 @@
         action(False, None, src, project, dst, present)
         os.unlink(tmp.name)
 
+    # Generate version control files.
     if config.vc_files:
         items = collections.defaultdict(list)
         for path in added_files:
             (directory, name) = os.path.split(path)
-            directory = project[directory]
             items[directory].append(["+", name])
         for path in removed_files:
             (directory, name) = os.path.split(path)
-            directory = project[directory]
             items[directory].append(["-", name])
         for directory in sorted(items):
-            gitignore = os.path.isdir(os.path.join(config.root, ".git"))
-            gitignore |= os.path.isfile(os.path.join(config.root, directory, ".gitignore"))
-            cvsignore = os.path.isdir(os.path.join(config.root, "CVS"))
-            cvsignore |= os.path.isdir(os.path.join(config.root, directory, "CVS"))
-            cvsignore |= os.path.isfile(os.path.join(config.root, directory, ".cvsignore"))
+            gitignore = os.path.isdir(os.path.join(project.root, ".git"))
+            cvsignore = os.path.isdir(os.path.join(project.root, "CVS"))
+            gitignore |= os.path.isfile(os.path.join(project.root, project[directory], ".gitignore"))
+            cvsignore |= os.path.isdir(os.path.join(project.root, project[directory], "CVS"))
+            cvsignore |= os.path.isfile(os.path.join(project.root, project[directory], ".cvsignore"))
             for kind in (([], [".gitignore"])[gitignore] + ([], [".cvsignore"])[cvsignore]):
                 anchor = {
                     ".gitignore": "/",
                     ".cvsignore": "",
                 }[kind]
-                path = project[os.path.join(directory, kind)]
+                path = os.path.join(directory, kind)
                 try:
                     with vfs_iostream(project, path,  "rb", "UTF-8") as stream:
                         ignores = [line.strip() for line in stream.readlines()]