#57 Please add support for the 'src' VCS.

Bob Hepple — Wed, 14 Nov 2018 10:53:25 -0000

Here's another diff which also implements basic 'src' usage but also supports for 'diffuse -c 4 todo.org' and 'diffuse -m' with the 'src' VCS. Again, this is against diffuse-0.4.8-7.fc28.noarch.

#57 Please add support for the 'src' VCS.

Bob Hepple — Mon, 12 Nov 2018 06:57:11 -0000

Here's a diff which implements basic 'src' usage - it's a brute copy & edit of the 'svn' code against diffuse-0.4.8-7.fc28.noarch. The getCommitTemplate() function is perhaps bogus for 'src' but a simple 'diffuse -r 9 foo.org' works fine!!

0 16:53 Sync/ $ diff -u /usr/bin/diffuse ~/diffuse 
--- /usr/bin/diffuse    2018-02-07 16:54:02.000000000 +1000
+++ /home/bhepple/diffuse   2018-11-12 16:54:17.790789053 +1000
@@ -881,6 +881,7 @@
                 ('hg', 'Mercurial', 'hg'),
                 ('mtn', 'Monotone', 'mtn'),
                 ('rcs', 'RCS', None),
+                ('src', 'SRC', 'src'),
                 ('svn', 'Subversion', 'svn'),
                 ('svk', 'SVK', svk_bin) ]

@@ -2460,6 +2461,214 @@
                 return popenRead(self.root, [ vcs_bin, 'cat', '%s@%s' % (safeRelativePath(self.root, name, prefs, 'svn_cygwin'), rev) ], prefs, 'svn_bash')
             return popenRead(self.root, [ vcs_bin, 'cat', '%s/%s@%s' % (self._getURL(prefs), relpath(self.root, os.path.abspath(name)).replace(os.sep, '/'), rev) ], prefs, 'svn_bash')

+    # SRC support
+    class Src:
+        def __init__(self, root):
+            self.root = root
+            self.url = None
+
+        def _getVcs(self):
+            return 'src'
+
+        def _getURLPrefix(self):
+            return 'URL: '
+
+        def _parseStatusLine(self, s):
+            if len(s) < 8 or s[0] not in 'ACDMR':
+                return
+            # subversion 1.6 adds a new column
+            k = 7
+            if k < len(s) and s[k] == ' ':
+                k += 1
+            return s[0], s[k:]
+
+        def _getPreviousRevision(self, rev):
+            if rev is None:
+                return 'BASE'
+            m = int(rev)
+            if m > 1:
+                return str(m - 1)
+
+        def _getURL(self, prefs):
+            if self.url is None:
+                vcs, prefix = self._getVcs(), self._getURLPrefix()
+                n = len(prefix)
+                args = [ prefs.getString(vcs + '_bin'), 'info' ]
+                for s in popenReadLines(self.root, args, prefs, vcs + '_bash'):
+                    if s.startswith(prefix):
+                        self.url = s[n:]
+                        break
+            return self.url
+
+        def getFileTemplate(self, prefs, name):
+            # FIXME: verify this
+            # merge conflict
+            left = glob.glob(name + '.merge-left.r*')
+            right = glob.glob(name + '.merge-right.r*')
+            if len(left) > 0 and len(right) > 0:
+                return [ (left[-1], None), (name, None), (right[-1], None) ]
+            # update conflict
+            left = sorted(glob.glob(name + '.r*'))
+            right = glob.glob(name + '.mine')
+            right.extend(glob.glob(name + '.working'))
+            if len(left) > 0 and len(right) > 0:
+                return [ (left[-1], None), (name, None), (right[0], None) ]
+            # default case
+            return [ (name, self._getPreviousRevision(None)), (name, None) ]
+
+        def _getCommitTemplate(self, prefs, rev, names):
+            result = []
+            try:
+                prev = self._getPreviousRevision(rev)
+            except ValueError, e:
+                logError(_('Error parsing revision %s.') % (rev, ))
+                return result
+
+            # build command
+            vcs = self._getVcs()
+            vcs_bin, vcs_bash = prefs.getString(vcs + '_bin'), vcs + '_bash'
+            if rev is None:
+                args = [ vcs_bin, 'status', '-q' ]
+            else:
+                args = [ vcs_bin, 'diff', '--summarize', '-c', rev ]
+            # build list of interesting files
+            pwd, isabs = os.path.abspath(os.curdir), False
+            for name in names:
+                isabs |= os.path.isabs(name)
+                if rev is None:
+                    args.append(safeRelativePath(self.root, name, prefs, vcs + '_cygwin'))
+            # run command
+            fs = _VcsFolderSet(names)
+            modified, added, removed = {}, set(), set()
+            for s in popenReadLines(self.root, args, prefs, vcs_bash):
+                status = self._parseStatusLine(s)
+                if status is None:
+                    continue
+                v, k = status
+                rel = prefs.convertToNativePath(k)
+                k = os.path.join(self.root, rel)
+                if fs.contains(k):
+                    if v == 'D':
+                        # deleted file or directory
+                        # the contents of deleted folders are not reported
+                        # by "src diff --summarize -c <rev>"
+                        removed.add(rel)
+                    elif v == 'A':
+                        # new file or directory
+                        added.add(rel)
+                    elif v == 'M':
+                        # modified file or merge conflict
+                        k = os.path.join(self.root, k)
+                        if not isabs:
+                            k = relpath(pwd, k)
+                        modified[k] = [ (k, prev), (k, rev) ]
+                    elif v == 'C':
+                        # merge conflict
+                        modified[k] = self.getFileTemplate(prefs, k)
+                    elif v == 'R':
+                        # replaced file
+                        removed.add(rel)
+                        added.add(rel)
+            # look for files in the added items
+            if rev is None:
+                m, added = added, {}
+                for k in m:
+                    if not os.path.isdir(k):
+                        # confirmed as added file
+                        k = os.path.join(self.root, k)
+                        if not isabs:
+                            k = relpath(pwd, k)
+                        added[k] = [ (None, None), (k, None) ]
+            else:
+                m = {}
+                for k in added:
+                    d, b = os.path.dirname(k), os.path.basename(k)
+                    if d not in m:
+                        m[d] = set()
+                    m[d].add(b)
+                # remove items we can easily determine to be directories
+                for k in m.keys():
+                    d = os.path.dirname(k)
+                    if d in m:
+                        m[d].discard(os.path.basename(k))
+                        if not m[d]:
+                            del m[d]
+                # determine which are directories
+                added = {}
+                for p, v in m.items():
+                    for s in popenReadLines(self.root, [ vcs_bin, 'list', '-r', rev, '%s/%s' % (self._getURL(prefs), p.replace(os.sep, '/')) ], prefs, vcs_bash):
+                        if s in v:
+                            # confirmed as added file
+                            k = os.path.join(self.root, os.path.join(p, s))
+                            if not isabs:
+                                k = relpath(pwd, k)
+                            added[k] = [ (None, None), (k, rev) ]
+            # determine if removed items are files or directories
+            if prev == 'BASE':
+                m, removed = removed, {}
+                for k in m:
+                    if not os.path.isdir(k):
+                        # confirmed item as file
+                        k = os.path.join(self.root, k)
+                        if not isabs:
+                            k = relpath(pwd, k)
+                        removed[k] = [ (k, prev), (None, None) ]
+            else:
+                m = {}
+                for k in removed:
+                    d, b = os.path.dirname(k), os.path.basename(k)
+                    if d not in m:
+                        m[d] = set()
+                    m[d].add(b)
+                removed_dir, removed = set(), {}
+                for p, v in m.items():
+                    for s in popenReadLines(self.root, [ vcs_bin, 'list', '-r', prev, '%s/%s' % (self._getURL(prefs), p.replace(os.sep, '/')) ], prefs, vcs_bash):
+                        if s.endswith('/'):
+                            s = s[:-1]
+                            if s in v:
+                                # confirmed item as directory
+                                removed_dir.add(os.path.join(p, s))
+                        else:
+                            if s in v:
+                                # confirmed item as file
+                                k = os.path.join(self.root, os.path.join(p, s))
+                                if not isabs:
+                                    k = relpath(pwd, k)
+                                removed[k] = [ (k, prev), (None, None) ]
+                # recursively find all unreported removed files
+                while removed_dir:
+                    tmp = removed_dir
+                    removed_dir = set()
+                    for p in tmp:
+                        for s in popenReadLines(self.root, [ vcs_bin, 'list', '-r', prev, '%s/%s' % (self._getURL(prefs), p.replace(os.sep, '/')) ], prefs, vcs_bash):
+                            if s.endswith('/'):
+                                # confirmed item as directory
+                                removed_dir.add(os.path.join(p, s[:-1]))
+                            else:
+                                # confirmed item as file
+                                k = os.path.join(self.root, os.path.join(p, s))
+                                if not isabs:
+                                    k = relpath(pwd, k)
+                                removed[k] = [ (k, prev), (None, None) ]
+            # sort the results
+            r = set()
+            for m in removed, added, modified:
+                r.update(m.keys())
+            for k in sorted(r):
+                for m in removed, added, modified:
+                    if k in m:
+                        result.append(m[k])
+            return result
+
+        def getCommitTemplate(self, prefs, rev, names):
+            return self._getCommitTemplate(prefs, rev, names)
+
+        def getFolderTemplate(self, prefs, names):
+            return self._getCommitTemplate(prefs, None, names)
+
+        def getRevision(self, prefs, name, rev):
+            return popenRead(self.root, [ prefs.getString('src_bin'), "cat", rev, safeRelativePath(self.root, name, prefs, 'src_cygwin') ], prefs, 'src_bash')
+
     # SVK support
     def isSvkManaged(self, name):
         # parse the ~/.svk/config file to discover which directories are part
@@ -2551,7 +2760,7 @@
             svkroot = os.path.expanduser('~/.svk')
         self.svkconfig = os.path.join(svkroot, 'config')
         self.leaf_dir_repos = [ ('CVS', VCSs.Cvs), ('RCS', VCSs.Rcs) ]
-        self.common_dir_repos = [ ('.git', VCSs.Git), ('.hg', VCSs.Hg), ('.svn', VCSs.Svn), ('.bzr', VCSs.Bzr), ('_darcs', VCSs.Darcs), ('_MTN', VCSs.Mtn) ]
+        self.common_dir_repos = [ ('.git', VCSs.Git), ('.hg', VCSs.Hg), ('.svn', VCSs.Svn), ('.src', VCSs.Src), ('.bzr', VCSs.Bzr), ('_darcs', VCSs.Darcs), ('_MTN', VCSs.Mtn) ]

     # determines which VCS to use for the named file
     def findByFolder(self, path, prefs):

Please add support for the 'src' VCS.

Bob Hepple — Mon, 12 Nov 2018 06:13:10 -0000

Eric S. Raymond created the 'src' VCS in 2014 - effectively putting a 'svn' front end onto RCS. It's very useful as an ultra lightweight VCS and I would love to have it supported by diffuse.

FAQ http://www.catb.org/~esr/src/FAQ.html

resources http://www.catb.org/~esr/src/

man page http://www.catb.org/~esr/src/src.html

source: https://gitlab.com/esr/src

https://www.emacswiki.org/emacs/VersionControlAlways

Thanks

Bob Hepple

Recent changes to 57: Please add support for the 'src' VCS.

#57 Please add support for the 'src' VCS.

#57 Please add support for the 'src' VCS.

Please add support for the 'src' VCS.