From b645d2cd3837b5208006e30febd63aca345c03b4 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 13:12:20 -0500 Subject: [PATCH 01/11] Modularize VCSs and convert Git VCS --- src/diffuse.in | 1 - src/main.py | 382 +++++++++++++++------------------------ src/meson.build | 1 + src/utils.py | 14 ++ src/vcs/__init__.py | 0 src/vcs/folder_set.py | 45 +++++ src/vcs/git.py | 155 ++++++++++++++++ src/vcs/vcs_interface.py | 39 ++++ 8 files changed, 404 insertions(+), 233 deletions(-) create mode 100644 src/vcs/__init__.py create mode 100644 src/vcs/folder_set.py create mode 100644 src/vcs/git.py create mode 100644 src/vcs/vcs_interface.py diff --git a/src/diffuse.in b/src/diffuse.in index dd38f22..dab1359 100755 --- a/src/diffuse.in +++ b/src/diffuse.in @@ -31,5 +31,4 @@ gettext.install('diffuse', localedir) if __name__ == '__main__': from diffuse import main - sys.exit(main.main()) diff --git a/src/main.py b/src/main.py index 321bfa6..fa9b217 100644 --- a/src/main.py +++ b/src/main.py @@ -53,6 +53,8 @@ from urllib.parse import urlparse from diffuse import utils from diffuse import constants +from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.git import Git if not hasattr(__builtins__, 'WindowsError'): # define 'WindowsError' so 'except' statements will work on all platforms @@ -1194,24 +1196,10 @@ def drive_from_path(s): return os.path.join(c[:4]) return c[0] -# constructs a relative path from 'a' to 'b', both should be absolute paths -def relpath(a, b): - if utils.isWindows(): - if drive_from_path(a) != drive_from_path(b): - return b - c1 = [ c for c in a.split(os.sep) if c != '' ] - c2 = [ c for c in b.split(os.sep) if c != '' ] - i, n = 0, len(c1) - while i < n and i < len(c2) and c1[i] == c2[i]: - i += 1 - r = (n - i) * [ os.pardir ] - r.extend(c2[i:]) - return os.sep.join(r) - # helper function prevent files from being confused with command line options # by prepending './' to the basename def safeRelativePath(abspath1, name, prefs, cygwin_pref): - s = os.path.join(os.curdir, relpath(abspath1, os.path.abspath(name))) + s = os.path.join(os.curdir, utils.relpath(abspath1, os.path.abspath(name))) if utils.isWindows(): if prefs.getBool(cygwin_pref): s = s.replace('\\', '/') @@ -1223,29 +1211,6 @@ def safeRelativePath(abspath1, name, prefs, cygwin_pref): def bashEscape(s): return "'" + s.replace("'", "'\\''") + "'" -# utility class to help support Git and Monotone -# represents a set of files and folders of interest for "git status" or -# "mtn automate inventory" -class _VcsFolderSet: - def __init__(self, names): - self.folders = f = [] - for name in names: - name = os.path.abspath(name) - # ensure all names end with os.sep - if not name.endswith(os.sep): - name += os.sep - f.append(name) - - # returns True if the given abspath is a file that should be included in - # the interesting file subset - def contains(self, abspath): - if not abspath.endswith(os.sep): - abspath += os.sep - for f in self.folders: - if abspath.startswith(f): - return True - return False - # utility method to help find folders used by version control systems def _find_parent_dir_with(path, dir_name): while True: @@ -1257,25 +1222,6 @@ def _find_parent_dir_with(path, dir_name): break path = newpath -# These class implement the set of supported version control systems. Each -# version control system should implement: -# -# __init__(): -# the object will initialised with the repository's root folder -# -# getFileTemplate(): -# indicates which revisions to display for a file when none were -# explicitly requested -# -# getCommitTemplate(): -# indicates which file revisions to display for a commit -# -# getFolderTemplate(): -# indicates which file revisions to display for a set of folders -# -# getRevision(): -# returns the contents of the specified file revision - # Bazaar support class _Bzr: def __init__(self, root): @@ -1302,7 +1248,7 @@ class _Bzr: ss = utils.popenReadLines(self.root, args, prefs, 'bzr_bash') # parse response prev = 'before:' + rev - fs = _VcsFolderSet(names) + fs = FolderSet(names) added, modified, removed, renamed = {}, {}, {}, {} i, n = 0, len(ss) while i < n: @@ -1317,7 +1263,7 @@ class _Bzr: k = os.path.join(self.root, k) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) added[k] = [ (None, None), (k, rev) ] elif s.startswith('modified:'): # modified files @@ -1328,7 +1274,7 @@ class _Bzr: k = os.path.join(self.root, k) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) modified[k] = [ (k, prev), (k, rev) ] elif s.startswith('removed:'): # removed files @@ -1339,7 +1285,7 @@ class _Bzr: k = os.path.join(self.root, k) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) removed[k] = [ (k, prev), (None, None) ] elif s.startswith('renamed:'): # renamed files @@ -1354,8 +1300,8 @@ class _Bzr: k1 = os.path.join(self.root, k1) if fs.contains(k0) or fs.contains(k1): if not isabs: - k0 = relpath(pwd, k0) - k1 = relpath(pwd, k1) + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) renamed[k1] = [ (k0, prev), (k1, rev) ] # sort the results result, r = [], set() @@ -1377,7 +1323,7 @@ class _Bzr: args.append(safeRelativePath(self.root, name, prefs, 'bzr_cygwin')) # run command prev = '-1' - fs = _VcsFolderSet(names) + fs = FolderSet(names) added, modified, removed, renamed = {}, {}, {}, {} for s in utils.popenReadLines(self.root, args, prefs, 'bzr_bash'): # parse response @@ -1391,7 +1337,7 @@ class _Bzr: k = os.path.join(self.root, k) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) removed[k] = [ (k, prev), (None, None) ] elif y == 'N': # added @@ -1400,7 +1346,7 @@ class _Bzr: k = os.path.join(self.root, k) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) added[k] = [ (None, None), (k, None) ] elif y == 'M': # modified or merge conflict @@ -1409,7 +1355,7 @@ class _Bzr: k = os.path.join(self.root, k) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) modified[k] = self.getFileTemplate(prefs, k) elif s[0] == 'R': # renamed @@ -1422,8 +1368,8 @@ class _Bzr: k1 = os.path.join(self.root, k1) if fs.contains(k0) or fs.contains(k1): if not isabs: - k0 = relpath(pwd, k0) - k1 = relpath(pwd, k1) + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) renamed[k1] = [ (k0, prev), (k1, None) ] # sort the results result, r = [], set() @@ -1436,7 +1382,18 @@ class _Bzr: return result def getRevision(self, prefs, name, rev): - return utils.popenRead(self.root, [ prefs.getString('bzr_bin'), 'cat', '--name-from-revision', '-r', rev, safeRelativePath(self.root, name, prefs, 'bzr_cygwin') ], prefs, 'bzr_bash') + return utils.popenRead( + self.root, + [ + prefs.getString('bzr_bin'), + 'cat', + '--name-from-revision', + '-r', + rev, + safeRelativePath(self.root, name, prefs, 'bzr_cygwin') + ], + prefs, + 'bzr_bash') def _get_bzr_repo(path, prefs): p = _find_parent_dir_with(path, '.bzr') @@ -1483,7 +1440,7 @@ class _Cvs: args.append(safeRelativePath(self.root, name, prefs, 'cvs_cygwin')) # run command prev = 'BASE' - fs = _VcsFolderSet(names) + fs = FolderSet(names) modified = {} for s in utils.popenReadLines(self.root, args, prefs, 'cvs_bash'): # parse response @@ -1492,7 +1449,7 @@ class _Cvs: k = os.path.join(self.root, prefs.convertToNativePath(s[2:])) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) if s[0] == 'R': # removed modified[k] = [ (k, prev), (None, None) ] @@ -1509,10 +1466,30 @@ class _Cvs: def getRevision(self, prefs, name, rev): if rev == 'BASE' and not os.path.exists(name): # find revision for removed files - for s in utils.popenReadLines(self.root, [ prefs.getString('cvs_bin'), 'status', safeRelativePath(self.root, name, prefs, 'cvs_cygwin') ], prefs, 'cvs_bash'): + for s in utils.popenReadLines( + self.root, + [ + prefs.getString('cvs_bin'), + 'status', + safeRelativePath(self.root, name, prefs, 'cvs_cygwin') + ], + prefs, + 'cvs_bash'): if s.startswith(' Working revision:\t-'): rev = s.split('\t')[1][1:] - return utils.popenRead(self.root, [ prefs.getString('cvs_bin'), '-Q', 'update', '-p', '-r', rev, safeRelativePath(self.root, name, prefs, 'cvs_cygwin') ], prefs, 'cvs_bash') + return utils.popenRead( + self.root, + [ + prefs.getString('cvs_bin'), + '-Q', + 'update', + '-p', + '-r', + rev, + safeRelativePath(self.root, name, prefs, 'cvs_cygwin') + ], + prefs, + 'cvs_bash') def _get_cvs_repo(path, prefs): if os.path.isdir(os.path.join(path, 'CVS')): @@ -1561,7 +1538,7 @@ class _Darcs: i += 1 except (ValueError, IndexError): i = n - fs = _VcsFolderSet(names) + fs = FolderSet(names) added, modified, removed, renamed = {}, {}, {}, {} while i < n: s = ss[i] @@ -1581,7 +1558,7 @@ class _Darcs: k = os.path.join(self.root, k) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) removed[k] = [ (k, prev), (None, None) ] elif x == 'A': # added @@ -1590,7 +1567,7 @@ class _Darcs: k = os.path.join(self.root, k) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) added[k] = [ (None, None), (k, rev) ] elif x == 'M': # modified @@ -1599,7 +1576,7 @@ class _Darcs: k = os.path.join(self.root, k) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) if k not in renamed: modified[k] = [ (k, prev), (k, rev) ] elif x == ' ': @@ -1613,8 +1590,8 @@ class _Darcs: k1 = os.path.join(self.root, k1) if fs.contains(k0) or fs.contains(k1): if not isabs: - k0 = relpath(pwd, k0) - k1 = relpath(pwd, k1) + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) renamed[k1] = [ (k0, prev), (k1, rev) ] # sort the results result, r = [], set() @@ -1646,128 +1623,6 @@ def _get_darcs_repo(path, prefs): if p: return _Darcs(p) -# Git support -class _Git: - def __init__(self, root): - self.root = root - - def getFileTemplate(self, prefs, name): - return [ (name, 'HEAD'), (name, None) ] - - def getCommitTemplate(self, prefs, rev, names): - # build command - args = [ prefs.getString('git_bin'), 'show', '--pretty=format:', '--name-status', rev ] - # build list of interesting files - pwd, isabs = os.path.abspath(os.curdir), False - for name in names: - isabs |= os.path.isabs(name) - # run command - prev = rev + '^' - fs = _VcsFolderSet(names) - modified = {} - for s in utils.popenReadLines(self.root, args, prefs, 'git_bash'): - # parse response - if len(s) < 2 or s[0] not in 'ADM': - continue - k = self._extractPath(s[2:], prefs) - if fs.contains(k): - if not isabs: - k = relpath(pwd, k) - if s[0] == 'D': - # removed - modified[k] = [ (k, prev), (None, None) ] - elif s[0] == 'A': - # added - modified[k] = [ (None, None), (k, rev) ] - else: - # modified - modified[k] = [ (k, prev), (k, rev) ] - # sort the results - return [ modified[k] for k in sorted(modified.keys()) ] - - def _extractPath(self, s, prefs): - return os.path.join(self.root, prefs.convertToNativePath(s.strip())) - - def getFolderTemplate(self, prefs, names): - # build command - args = [ prefs.getString('git_bin'), 'status', '--porcelain', '-s', '--untracked-files=no', '--ignore-submodules=all' ] - # build list of interesting files - pwd, isabs = os.path.abspath(os.curdir), False - for name in names: - isabs |= os.path.isabs(name) - # run command - prev = 'HEAD' - fs = _VcsFolderSet(names) - modified, renamed = {}, {} - # 'git status' will return 1 when a commit would fail - for s in utils.popenReadLines(self.root, args, prefs, 'git_bash', [0, 1]): - # parse response - if len(s) < 3: - continue - x, y, k = s[0], s[1], s[2:] - if x == 'R': - # renamed - k = k.split(' -> ') - if len(k) == 2: - k0 = self._extractPath(k[0], prefs) - k1 = self._extractPath(k[1], prefs) - if fs.contains(k0) or fs.contains(k1): - if not isabs: - k0 = relpath(pwd, k0) - k1 = relpath(pwd, k1) - renamed[k1] = [ (k0, prev), (k1, None) ] - elif x == 'U' or y == 'U' or (x == 'D' and y == 'D'): - # merge conflict - k = self._extractPath(k, prefs) - if fs.contains(k): - if not isabs: - k = relpath(pwd, k) - if x == 'D': - panes = [ (None, None) ] - else: - panes = [ (k, ':2') ] - panes.append((k, None)) - if y == 'D': - panes.append((None, None)) - else: - panes.append((k, ':3')) - if x != 'A' and y != 'A': - panes.append((k, ':1')) - modified[k] = panes - else: - k = self._extractPath(k, prefs) - if fs.contains(k): - if not isabs: - k = relpath(pwd, k) - if x == 'A': - # added - panes = [ (None, None) ] - else: - panes = [ (k, prev) ] - # staged changes - if x == 'D': - panes.append((None, None)) - elif x != ' ': - panes.append((k, ':0')) - # working copy changes - if y == 'D': - panes.append((None, None)) - elif y != ' ': - panes.append((k, None)) - modified[k] = panes - # sort the results - result, r = [], set() - for m in modified, renamed: - r.update(m.keys()) - for k in sorted(r): - for m in modified, renamed: - if k in m: - result.append(m[k]) - return result - - def getRevision(self, prefs, name, rev): - return utils.popenRead(self.root, [ prefs.getString('git_bin'), 'show', '{}:{}'.format(rev, relpath(self.root, os.path.abspath(name)).replace(os.sep, '/')) ], prefs, 'git_bash') - def _get_git_repo(path, prefs): if 'GIT_DIR' in os.environ: try: @@ -1788,7 +1643,7 @@ def _get_git_repo(path, prefs): d = os.curdir else: d = os.sep.join(d) - return _Git(d) + return Git(d) except (IOError, OSError, WindowsError): # working tree not found pass @@ -1796,7 +1651,7 @@ def _get_git_repo(path, prefs): while True: name = os.path.join(path, '.git') if os.path.isdir(name) or os.path.isfile(name): - return _Git(path) + return Git(path) newpath = os.path.dirname(path) if newpath == path: break @@ -1837,7 +1692,7 @@ class _Hg: args.append(safeRelativePath(self.root, name, prefs, 'hg_cygwin')) # run command prev = self._getPreviousRevision(prefs, rev) - fs = _VcsFolderSet(names) + fs = FolderSet(names) modified = {} for s in utils.popenReadLines(self.root, args, prefs, 'hg_bash'): # parse response @@ -1846,7 +1701,7 @@ class _Hg: k = os.path.join(self.root, prefs.convertToNativePath(s[2:])) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) if s[0] == 'R': # removed modified[k] = [ (k, prev), (None, None) ] @@ -1866,7 +1721,17 @@ class _Hg: return self._getCommitTemplate(prefs, names, [ 'status', '-q' ], None) def getRevision(self, prefs, name, rev): - return utils.popenRead(self.root, [ prefs.getString('hg_bin'), 'cat', '-r', rev, safeRelativePath(self.root, name, prefs, 'hg_cygwin') ], prefs, 'hg_bash') + return utils.popenRead( + self.root, + [ + prefs.getString('hg_bin'), + 'cat', + '-r', + rev, + safeRelativePath(self.root, name, prefs, 'hg_cygwin') + ], + prefs, + 'hg_bash') def _get_hg_repo(path, prefs): p = _find_parent_dir_with(path, '.hg') @@ -1890,7 +1755,7 @@ class _Mtn: raise IOError('Ambiguous revision specifier') args = [ vcs_bin, 'automate', 'get_revision', ss[0] ] # build list of interesting files - fs = _VcsFolderSet(names) + fs = FolderSet(names) pwd, isabs = os.path.abspath(os.curdir), False for name in names: isabs |= os.path.isabs(name) @@ -1960,12 +1825,12 @@ class _Mtn: if k in removed: k = removed[k] if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) result.append([ (k, prev), (None, None) ]) elif k in added: k = added[k] if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) result.append([ (None, None), (k, rev) ]) else: if k in renamed: @@ -1973,13 +1838,13 @@ class _Mtn: else: k0 = k1 = modified[k] if not isabs: - k0 = relpath(pwd, k0) - k1 = relpath(pwd, k1) + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) result.append([ (k0, prev), (k1, rev) ]) return result def getFolderTemplate(self, prefs, names): - fs = _VcsFolderSet(names) + fs = FolderSet(names) result = [] pwd, isabs = os.path.abspath(os.curdir), False args = [ prefs.getString('mtn_bin'), 'automate', 'inventory', '--no-ignored', '--no-unchanged', '--no-unknown' ] @@ -2009,7 +1874,7 @@ class _Mtn: k = os.path.join(self.root, prefs.convertToNativePath(p)) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) removed[k] = [ (k, prev), (None, None) ] processed = True if 'added' in s and 'file' in m.get('new_type', []): @@ -2017,7 +1882,7 @@ class _Mtn: k = os.path.join(self.root, prefs.convertToNativePath(p)) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) added[k] = [ (None, None), (k, None) ] processed = True if 'rename_target' in s and 'file' in m.get('new_type', []) and len(m.get('old_path', [])) > 0: @@ -2026,8 +1891,8 @@ class _Mtn: k1 = os.path.join(self.root, prefs.convertToNativePath(p)) if fs.contains(k0) or fs.contains(k1): if not isabs: - k0 = relpath(pwd, k0) - k1 = relpath(pwd, k1) + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) renamed[k1] = [ (k0, prev), (k1, None) ] processed = True if not processed and 'file' in m.get('fs_type', []): @@ -2035,7 +1900,7 @@ class _Mtn: k = os.path.join(self.root, prefs.convertToNativePath(p)) if fs.contains(k): if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) modified[k] = [ (k, prev), (k, None) ] # sort the results r = set() @@ -2048,7 +1913,19 @@ class _Mtn: return result def getRevision(self, prefs, name, rev): - return utils.popenRead(self.root, [ prefs.getString('mtn_bin'), 'automate', 'get_file_of', '-q', '-r', rev, safeRelativePath(self.root, name, prefs, 'mtn_cygwin') ], prefs, 'mtn_bash') + return utils.popenRead( + self.root, + [ + prefs.getString('mtn_bin'), + 'automate', + 'get_file_of', + '-q', + '-r', + rev, + safeRelativePath(self.root, name, prefs, 'mtn_cygwin') + ], + prefs, + 'mtn_bash') def _get_mtn_repo(path, prefs): p = _find_parent_dir_with(path, '_MTN') @@ -2145,14 +2022,24 @@ class _Rcs: k = prefs.convertToNativePath(line[14:]) k = os.path.join(self.root, os.path.normpath(k)) if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) elif line.startswith('head: '): r[k] = line[6:] # sort the results return [ [ (k, r[k]), (k, None) ] for k in sorted(r.keys()) ] def getRevision(self, prefs, name, rev): - return utils.popenRead(self.root, [ prefs.getString('rcs_bin_co'), '-p', '-q', '-r' + rev, safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ], prefs, 'rcs_bash') + return utils.popenRead( + self.root, + [ + prefs.getString('rcs_bin_co'), + '-p', + '-q', + '-r' + rev, + safeRelativePath(self.root, name, prefs, 'rcs_cygwin') + ], + prefs, + 'rcs_bash') def _get_rcs_repo(path, prefs): if os.path.isdir(os.path.join(path, 'RCS')): @@ -2248,7 +2135,7 @@ class _Svn: if rev is None: args.append(safeRelativePath(self.root, name, prefs, vcs + '_cygwin')) # run command - fs = _VcsFolderSet(names) + fs = FolderSet(names) modified, added, removed = {}, set(), set() for s in utils.popenReadLines(self.root, args, prefs, vcs_bash): status = self._parseStatusLine(s) @@ -2270,7 +2157,7 @@ class _Svn: # modified file or merge conflict k = os.path.join(self.root, k) if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) modified[k] = [ (k, prev), (k, rev) ] elif v == 'C': # merge conflict @@ -2287,7 +2174,7 @@ class _Svn: # confirmed as added file k = os.path.join(self.root, k) if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) added[k] = [ (None, None), (k, None) ] else: m = {} @@ -2311,7 +2198,7 @@ class _Svn: # confirmed as added file k = os.path.join(self.root, os.path.join(p, s)) if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) added[k] = [ (None, None), (k, rev) ] # determine if removed items are files or directories if prev == 'BASE': @@ -2321,7 +2208,7 @@ class _Svn: # confirmed item as file k = os.path.join(self.root, k) if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) removed[k] = [ (k, prev), (None, None) ] else: m = {} @@ -2343,7 +2230,7 @@ class _Svn: # confirmed item as file k = os.path.join(self.root, os.path.join(p, s)) if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) removed[k] = [ (k, prev), (None, None) ] # recursively find all unreported removed files while removed_dir: @@ -2358,7 +2245,7 @@ class _Svn: # confirmed item as file k = os.path.join(self.root, os.path.join(p, s)) if not isabs: - k = relpath(pwd, k) + k = utils.relpath(pwd, k) removed[k] = [ (k, prev), (None, None) ] # sort the results r = set() @@ -2379,8 +2266,27 @@ class _Svn: def getRevision(self, prefs, name, rev): vcs_bin = prefs.getString('svn_bin') if rev in [ 'BASE', 'COMMITTED', 'PREV' ]: - return utils.popenRead(self.root, [ vcs_bin, 'cat', '{}@{}'.format(safeRelativePath(self.root, name, prefs, 'svn_cygwin'), rev) ], prefs, 'svn_bash') - return utils.popenRead(self.root, [ vcs_bin, 'cat', '{}/{}@{}'.format(self._getURL(prefs), relpath(self.root, os.path.abspath(name)).replace(os.sep, '/'), rev) ], prefs, 'svn_bash') + return utils.popenRead( + self.root, + [ + vcs_bin, + 'cat', + '{}@{}'.format(safeRelativePath(self.root, name, prefs, 'svn_cygwin'), rev) + ], + prefs, + 'svn_bash') + return utils.popenRead( + self.root, + [ + vcs_bin, + 'cat', + '{}/{}@{}'.format( + self._getURL(prefs), + utils.relpath(self.root, os.path.abspath(name)).replace(os.sep, '/'), + rev) + ], + prefs, + 'svn_bash') def _get_svn_repo(path, prefs): p = _find_parent_dir_with(path, '.svn') @@ -2410,7 +2316,19 @@ class _Svk(_Svn): return str(int(rev) - 1) def getRevision(self, prefs, name, rev): - return utils.popenRead(self.root, [ prefs.getString('svk_bin'), 'cat', '-r', rev, '{}/{}'.format(self._getURL(prefs), relpath(self.root, os.path.abspath(name)).replace(os.sep, '/')) ], prefs, 'svk_bash') + return utils.popenRead( + self.root, + [ + prefs.getString('svk_bin'), + 'cat', + '-r', + rev, + '{}/{}'.format( + self._getURL(prefs), + utils.relpath(self.root, os.path.abspath(name)).replace(os.sep, '/')) + ], + prefs, + 'svk_bash') def _get_svk_repo(path, prefs): name = path @@ -2469,7 +2387,7 @@ def _get_svk_repo(path, prefs): projs.append(key) break # check if the file belongs to one of the project directories - if _VcsFolderSet(projs).contains(name): + if FolderSet(projs).contains(name): return _Svk(path) except IOError: utils.logError(_('Error parsing %s.') % (svkconfig, )) diff --git a/src/meson.build b/src/meson.build index d463101..1d93c65 100644 --- a/src/meson.build +++ b/src/meson.build @@ -37,3 +37,4 @@ diffuse_sources = [ ] install_data(diffuse_sources, install_dir: moduledir) +install_subdir('vcs', install_dir: moduledir, strip_directory: false) diff --git a/src/utils.py b/src/utils.py index 08ebf04..39af34a 100644 --- a/src/utils.py +++ b/src/utils.py @@ -79,6 +79,20 @@ def make_subdirs(p, ss): def useFlatpak(): return constants.use_flatpak +# constructs a relative path from 'a' to 'b', both should be absolute paths +def relpath(a, b): + if isWindows(): + if drive_from_path(a) != drive_from_path(b): + return b + c1 = [ c for c in a.split(os.sep) if c != '' ] + c2 = [ c for c in b.split(os.sep) if c != '' ] + i, n = 0, len(c1) + while i < n and i < len(c2) and c1[i] == c2[i]: + i += 1 + r = (n - i) * [ os.pardir ] + r.extend(c2[i:]) + return os.sep.join(r) + # use popen to read the output of a command def popenRead(dn, cmd, prefs, bash_pref, success_results=None): if success_results is None: diff --git a/src/vcs/__init__.py b/src/vcs/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/vcs/folder_set.py b/src/vcs/folder_set.py new file mode 100644 index 0000000..a674acc --- /dev/null +++ b/src/vcs/folder_set.py @@ -0,0 +1,45 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os + +class FolderSet: + '''Utility class to help support Git and Monotone. + Represents a set of files and folders of interest for "git status" or + "mtn automate inventory."''' + + def __init__(self, names): + self.folders = f = [] + for name in names: + name = os.path.abspath(name) + # ensure all names end with os.sep + if not name.endswith(os.sep): + name += os.sep + f.append(name) + + # returns True if the given abspath is a file that should be included in + # the interesting file subset + def contains(self, abspath): + if not abspath.endswith(os.sep): + abspath += os.sep + for f in self.folders: + if abspath.startswith(f): + return True + return False + diff --git a/src/vcs/git.py b/src/vcs/git.py new file mode 100644 index 0000000..46e2903 --- /dev/null +++ b/src/vcs/git.py @@ -0,0 +1,155 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os + +from diffuse import utils +from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.vcs_interface import VcsInterface + +# Git support +class Git(VcsInterface): + def getFileTemplate(self, prefs, name): + return [ (name, 'HEAD'), (name, None) ] + + def getCommitTemplate(self, prefs, rev, names): + # build command + args = [ prefs.getString('git_bin'), 'show', '--pretty=format:', '--name-status', rev ] + # build list of interesting files + pwd = os.path.abspath(os.curdir) + isabs = False + for name in names: + isabs |= os.path.isabs(name) + # run command + prev = rev + '^' + fs = FolderSet(names) + modified = {} + for s in utils.popenReadLines(self.root, args, prefs, 'git_bash'): + # parse response + if len(s) < 2 or s[0] not in 'ADM': + continue + k = self._extractPath(s[2:], prefs) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + if s[0] == 'D': + # removed + modified[k] = [ (k, prev), (None, None) ] + elif s[0] == 'A': + # added + modified[k] = [ (None, None), (k, rev) ] + else: + # modified + modified[k] = [ (k, prev), (k, rev) ] + # sort the results + return [ modified[k] for k in sorted(modified.keys()) ] + + def _extractPath(self, s, prefs): + return os.path.join(self.root, prefs.convertToNativePath(s.strip())) + + def getFolderTemplate(self, prefs, names): + # build command + args = [ prefs.getString('git_bin'), 'status', '--porcelain', '-s', '--untracked-files=no', '--ignore-submodules=all' ] + # build list of interesting files + pwd = os.path.abspath(os.curdir) + isabs = False + for name in names: + isabs |= os.path.isabs(name) + # run command + prev = 'HEAD' + fs = FolderSet(names) + modified, renamed = {}, {} + # 'git status' will return 1 when a commit would fail + for s in utils.popenReadLines(self.root, args, prefs, 'git_bash', [0, 1]): + # parse response + if len(s) < 3: + continue + x, y, k = s[0], s[1], s[2:] + if x == 'R': + # renamed + k = k.split(' -> ') + if len(k) == 2: + k0 = self._extractPath(k[0], prefs) + k1 = self._extractPath(k[1], prefs) + if fs.contains(k0) or fs.contains(k1): + if not isabs: + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) + renamed[k1] = [ (k0, prev), (k1, None) ] + elif x == 'U' or y == 'U' or (x == 'D' and y == 'D'): + # merge conflict + k = self._extractPath(k, prefs) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + if x == 'D': + panes = [ (None, None) ] + else: + panes = [ (k, ':2') ] + panes.append((k, None)) + if y == 'D': + panes.append((None, None)) + else: + panes.append((k, ':3')) + if x != 'A' and y != 'A': + panes.append((k, ':1')) + modified[k] = panes + else: + k = self._extractPath(k, prefs) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + if x == 'A': + # added + panes = [ (None, None) ] + else: + panes = [ (k, prev) ] + # staged changes + if x == 'D': + panes.append((None, None)) + elif x != ' ': + panes.append((k, ':0')) + # working copy changes + if y == 'D': + panes.append((None, None)) + elif y != ' ': + panes.append((k, None)) + modified[k] = panes + # sort the results + result, r = [], set() + for m in modified, renamed: + r.update(m.keys()) + for k in sorted(r): + for m in modified, renamed: + if k in m: + result.append(m[k]) + return result + + def getRevision(self, prefs, name, rev): + return utils.popenRead( + self.root, + [ + prefs.getString('git_bin'), + 'show', + '{}:{}'.format( + rev, + utils.relpath(self.root, os.path.abspath(name)).replace(os.sep, '/')) + ], + prefs, + 'git_bash') diff --git a/src/vcs/vcs_interface.py b/src/vcs/vcs_interface.py new file mode 100644 index 0000000..16b57a0 --- /dev/null +++ b/src/vcs/vcs_interface.py @@ -0,0 +1,39 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +class VcsInterface: + def __init__(self, root): + """The object will initialized with the repository's root folder.""" + + self.root = root + + def getFileTemplate(self, prefs, name): + """Indicates which revisions to display for a file when none were explicitly requested.""" + pass + + def getCommitTemplate(self, prefs, rev, names): + """Indicates which file revisions to display for a commit.""" + pass + + def getFolderTemplate(self, prefs, names): + """Indicates which file revisions to display for a set of folders.""" + + def getRevision(self, prefs, name, rev): + """Returns the contents of the specified file revision""" + pass From a89f85db7a5bfa1656e8eaf54a462cae03fddc10 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 13:40:46 -0500 Subject: [PATCH 02/11] Convert Bazaar VCS --- src/main.py | 213 ++++--------------------------------------------- src/utils.py | 11 +++ src/vcs/bzr.py | 194 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 220 insertions(+), 198 deletions(-) create mode 100644 src/vcs/bzr.py diff --git a/src/main.py b/src/main.py index fa9b217..cab5108 100644 --- a/src/main.py +++ b/src/main.py @@ -54,6 +54,7 @@ from urllib.parse import urlparse from diffuse import utils from diffuse import constants from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.bzr import Bzr from diffuse.vcs.git import Git if not hasattr(__builtins__, 'WindowsError'): @@ -1196,17 +1197,6 @@ def drive_from_path(s): return os.path.join(c[:4]) return c[0] -# helper function prevent files from being confused with command line options -# by prepending './' to the basename -def safeRelativePath(abspath1, name, prefs, cygwin_pref): - s = os.path.join(os.curdir, utils.relpath(abspath1, os.path.abspath(name))) - if utils.isWindows(): - if prefs.getBool(cygwin_pref): - s = s.replace('\\', '/') - else: - s = s.replace('/', '\\') - return s - # escape arguments for use with bash def bashEscape(s): return "'" + s.replace("'", "'\\''") + "'" @@ -1222,183 +1212,10 @@ def _find_parent_dir_with(path, dir_name): break path = newpath -# Bazaar support -class _Bzr: - def __init__(self, root): - self.root = root - - def getFileTemplate(self, prefs, name): - # merge conflict - left = name + '.OTHER' - right = name + '.THIS' - if os.path.isfile(left) and os.path.isfile(right): - return [ (left, None), (name, None), (right, None) ] - # default case - return [ (name, '-1'), (name, None) ] - - def getCommitTemplate(self, prefs, rev, names): - # build command - args = [ prefs.getString('bzr_bin'), 'log', '-v', '-r', rev ] - # build list of interesting files - pwd, isabs = os.path.abspath(os.curdir), False - for name in names: - isabs |= os.path.isabs(name) - args.append(safeRelativePath(self.root, name, prefs, 'bzr_cygwin')) - # run command - ss = utils.popenReadLines(self.root, args, prefs, 'bzr_bash') - # parse response - prev = 'before:' + rev - fs = FolderSet(names) - added, modified, removed, renamed = {}, {}, {}, {} - i, n = 0, len(ss) - while i < n: - s = ss[i] - i += 1 - if s.startswith('added:'): - # added files - while i < n and ss[i].startswith(' '): - k = prefs.convertToNativePath(ss[i][2:]) - i += 1 - if not k.endswith(os.sep): - k = os.path.join(self.root, k) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - added[k] = [ (None, None), (k, rev) ] - elif s.startswith('modified:'): - # modified files - while i < n and ss[i].startswith(' '): - k = prefs.convertToNativePath(ss[i][2:]) - i += 1 - if not k.endswith(os.sep): - k = os.path.join(self.root, k) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - modified[k] = [ (k, prev), (k, rev) ] - elif s.startswith('removed:'): - # removed files - while i < n and ss[i].startswith(' '): - k = prefs.convertToNativePath(ss[i][2:]) - i += 1 - if not k.endswith(os.sep): - k = os.path.join(self.root, k) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - removed[k] = [ (k, prev), (None, None) ] - elif s.startswith('renamed:'): - # renamed files - while i < n and ss[i].startswith(' '): - k = ss[i][2:].split(' => ') - i += 1 - if len(k) == 2: - k0 = prefs.convertToNativePath(k[0]) - k1 = prefs.convertToNativePath(k[1]) - if not k0.endswith(os.sep) and not k1.endswith(os.sep): - k0 = os.path.join(self.root, k0) - k1 = os.path.join(self.root, k1) - if fs.contains(k0) or fs.contains(k1): - if not isabs: - k0 = utils.relpath(pwd, k0) - k1 = utils.relpath(pwd, k1) - renamed[k1] = [ (k0, prev), (k1, rev) ] - # sort the results - result, r = [], set() - for m in removed, added, modified, renamed: - r.update(m.keys()) - for k in sorted(r): - for m in removed, added, modified, renamed: - if k in m: - result.append(m[k]) - return result - - def getFolderTemplate(self, prefs, names): - # build command - args = [ prefs.getString('bzr_bin'), 'status', '-SV' ] - # build list of interesting files - pwd, isabs = os.path.abspath(os.curdir), False - for name in names: - isabs |= os.path.isabs(name) - args.append(safeRelativePath(self.root, name, prefs, 'bzr_cygwin')) - # run command - prev = '-1' - fs = FolderSet(names) - added, modified, removed, renamed = {}, {}, {}, {} - for s in utils.popenReadLines(self.root, args, prefs, 'bzr_bash'): - # parse response - if len(s) < 5: - continue - y, k = s[1], s[4:] - if y == 'D': - # removed - k = prefs.convertToNativePath(k) - if not k.endswith(os.sep): - k = os.path.join(self.root, k) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - removed[k] = [ (k, prev), (None, None) ] - elif y == 'N': - # added - k = prefs.convertToNativePath(k) - if not k.endswith(os.sep): - k = os.path.join(self.root, k) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - added[k] = [ (None, None), (k, None) ] - elif y == 'M': - # modified or merge conflict - k = prefs.convertToNativePath(k) - if not k.endswith(os.sep): - k = os.path.join(self.root, k) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - modified[k] = self.getFileTemplate(prefs, k) - elif s[0] == 'R': - # renamed - k = k.split(' => ') - if len(k) == 2: - k0 = prefs.convertToNativePath(k[0]) - k1 = prefs.convertToNativePath(k[1]) - if not k0.endswith(os.sep) and not k1.endswith(os.sep): - k0 = os.path.join(self.root, k0) - k1 = os.path.join(self.root, k1) - if fs.contains(k0) or fs.contains(k1): - if not isabs: - k0 = utils.relpath(pwd, k0) - k1 = utils.relpath(pwd, k1) - renamed[k1] = [ (k0, prev), (k1, None) ] - # sort the results - result, r = [], set() - for m in removed, added, modified, renamed: - r.update(m.keys()) - for k in sorted(r): - for m in removed, added, modified, renamed: - if k in m: - result.append(m[k]) - return result - - def getRevision(self, prefs, name, rev): - return utils.popenRead( - self.root, - [ - prefs.getString('bzr_bin'), - 'cat', - '--name-from-revision', - '-r', - rev, - safeRelativePath(self.root, name, prefs, 'bzr_cygwin') - ], - prefs, - 'bzr_bash') - def _get_bzr_repo(path, prefs): p = _find_parent_dir_with(path, '.bzr') if p: - return _Bzr(p) + return Bzr(p) # CVS support class _Cvs: @@ -1437,7 +1254,7 @@ class _Cvs: pwd, isabs = os.path.abspath(os.curdir), False for name in names: isabs |= os.path.isabs(name) - args.append(safeRelativePath(self.root, name, prefs, 'cvs_cygwin')) + args.append(utils.safeRelativePath(self.root, name, prefs, 'cvs_cygwin')) # run command prev = 'BASE' fs = FolderSet(names) @@ -1471,7 +1288,7 @@ class _Cvs: [ prefs.getString('cvs_bin'), 'status', - safeRelativePath(self.root, name, prefs, 'cvs_cygwin') + utils.safeRelativePath(self.root, name, prefs, 'cvs_cygwin') ], prefs, 'cvs_bash'): @@ -1486,7 +1303,7 @@ class _Cvs: '-p', '-r', rev, - safeRelativePath(self.root, name, prefs, 'cvs_cygwin') + utils.safeRelativePath(self.root, name, prefs, 'cvs_cygwin') ], prefs, 'cvs_bash') @@ -1520,7 +1337,7 @@ class _Darcs: for name in names: isabs |= os.path.isabs(name) if mods: - args.append(safeRelativePath(self.root, name, prefs, 'darcs_cygwin')) + args.append(utils.safeRelativePath(self.root, name, prefs, 'darcs_cygwin')) # run command # 'darcs whatsnew' will return 1 if there are no changes ss = utils.popenReadLines(self.root, args, prefs, 'darcs_bash', [0, 1]) @@ -1615,7 +1432,7 @@ class _Darcs: args.extend([ '-n', str(int(rev)) ]) except ValueError: args.extend([ '-h', rev ]) - args.append(safeRelativePath(self.root, name, prefs, 'darcs_cygwin')) + args.append(utils.safeRelativePath(self.root, name, prefs, 'darcs_cygwin')) return utils.popenRead(self.root, args, prefs, 'darcs_bash') def _get_darcs_repo(path, prefs): @@ -1689,7 +1506,7 @@ class _Hg: pwd, isabs = os.path.abspath(os.curdir), False for name in names: isabs |= os.path.isabs(name) - args.append(safeRelativePath(self.root, name, prefs, 'hg_cygwin')) + args.append(utils.safeRelativePath(self.root, name, prefs, 'hg_cygwin')) # run command prev = self._getPreviousRevision(prefs, rev) fs = FolderSet(names) @@ -1728,7 +1545,7 @@ class _Hg: 'cat', '-r', rev, - safeRelativePath(self.root, name, prefs, 'hg_cygwin') + utils.safeRelativePath(self.root, name, prefs, 'hg_cygwin') ], prefs, 'hg_bash') @@ -1922,7 +1739,7 @@ class _Mtn: '-q', '-r', rev, - safeRelativePath(self.root, name, prefs, 'mtn_cygwin') + utils.safeRelativePath(self.root, name, prefs, 'mtn_cygwin') ], prefs, 'mtn_bash') @@ -1938,7 +1755,7 @@ class _Rcs: self.root = root def getFileTemplate(self, prefs, name): - args = [ prefs.getString('rcs_bin_rlog'), '-L', '-h', safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ] + args = [ prefs.getString('rcs_bin_rlog'), '-L', '-h', utils.safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ] rev = '' for line in utils.popenReadLines(self.root, args, prefs, 'rcs_bash'): if line.startswith('head: '): @@ -2013,7 +1830,7 @@ class _Rcs: r.append(k) for k in r: isabs |= os.path.isabs(k) - args = [ safeRelativePath(self.root, k, prefs, 'rcs_cygwin') for k in r ] + args = [ utils.safeRelativePath(self.root, k, prefs, 'rcs_cygwin') for k in r ] # run command r, k = {}, '' for line in utils.popenXArgsReadLines(self.root, cmd, args, prefs, 'rcs_bash'): @@ -2036,7 +1853,7 @@ class _Rcs: '-p', '-q', '-r' + rev, - safeRelativePath(self.root, name, prefs, 'rcs_cygwin') + utils.safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ], prefs, 'rcs_bash') @@ -2133,7 +1950,7 @@ class _Svn: for name in names: isabs |= os.path.isabs(name) if rev is None: - args.append(safeRelativePath(self.root, name, prefs, vcs + '_cygwin')) + args.append(utils.safeRelativePath(self.root, name, prefs, vcs + '_cygwin')) # run command fs = FolderSet(names) modified, added, removed = {}, set(), set() @@ -2271,7 +2088,7 @@ class _Svn: [ vcs_bin, 'cat', - '{}@{}'.format(safeRelativePath(self.root, name, prefs, 'svn_cygwin'), rev) + '{}@{}'.format(utils.safeRelativePath(self.root, name, prefs, 'svn_cygwin'), rev) ], prefs, 'svn_bash') diff --git a/src/utils.py b/src/utils.py index 39af34a..9ab73f2 100644 --- a/src/utils.py +++ b/src/utils.py @@ -93,6 +93,17 @@ def relpath(a, b): r.extend(c2[i:]) return os.sep.join(r) +# helper function prevent files from being confused with command line options +# by prepending './' to the basename +def safeRelativePath(abspath1, name, prefs, cygwin_pref): + s = os.path.join(os.curdir, utils.relpath(abspath1, os.path.abspath(name))) + if utils.isWindows(): + if prefs.getBool(cygwin_pref): + s = s.replace('\\', '/') + else: + s = s.replace('/', '\\') + return s + # use popen to read the output of a command def popenRead(dn, cmd, prefs, bash_pref, success_results=None): if success_results is None: diff --git a/src/vcs/bzr.py b/src/vcs/bzr.py new file mode 100644 index 0000000..53f6ad9 --- /dev/null +++ b/src/vcs/bzr.py @@ -0,0 +1,194 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os + +from diffuse import utils +from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.vcs_interface import VcsInterface + +# Bazaar support +class Bzr(VcsInterface): + def getFileTemplate(self, prefs, name): + # merge conflict + left = name + '.OTHER' + right = name + '.THIS' + if os.path.isfile(left) and os.path.isfile(right): + return [ (left, None), (name, None), (right, None) ] + # default case + return [ (name, '-1'), (name, None) ] + + def getCommitTemplate(self, prefs, rev, names): + # build command + args = [ prefs.getString('bzr_bin'), 'log', '-v', '-r', rev ] + # build list of interesting files + pwd, isabs = os.path.abspath(os.curdir), False + for name in names: + isabs |= os.path.isabs(name) + args.append(utils.safeRelativePath(self.root, name, prefs, 'bzr_cygwin')) + # run command + ss = utils.popenReadLines(self.root, args, prefs, 'bzr_bash') + # parse response + prev = 'before:' + rev + fs = FolderSet(names) + added, modified, removed, renamed = {}, {}, {}, {} + i, n = 0, len(ss) + while i < n: + s = ss[i] + i += 1 + if s.startswith('added:'): + # added files + while i < n and ss[i].startswith(' '): + k = prefs.convertToNativePath(ss[i][2:]) + i += 1 + if not k.endswith(os.sep): + k = os.path.join(self.root, k) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + added[k] = [ (None, None), (k, rev) ] + elif s.startswith('modified:'): + # modified files + while i < n and ss[i].startswith(' '): + k = prefs.convertToNativePath(ss[i][2:]) + i += 1 + if not k.endswith(os.sep): + k = os.path.join(self.root, k) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + modified[k] = [ (k, prev), (k, rev) ] + elif s.startswith('removed:'): + # removed files + while i < n and ss[i].startswith(' '): + k = prefs.convertToNativePath(ss[i][2:]) + i += 1 + if not k.endswith(os.sep): + k = os.path.join(self.root, k) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + removed[k] = [ (k, prev), (None, None) ] + elif s.startswith('renamed:'): + # renamed files + while i < n and ss[i].startswith(' '): + k = ss[i][2:].split(' => ') + i += 1 + if len(k) == 2: + k0 = prefs.convertToNativePath(k[0]) + k1 = prefs.convertToNativePath(k[1]) + if not k0.endswith(os.sep) and not k1.endswith(os.sep): + k0 = os.path.join(self.root, k0) + k1 = os.path.join(self.root, k1) + if fs.contains(k0) or fs.contains(k1): + if not isabs: + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) + renamed[k1] = [ (k0, prev), (k1, rev) ] + # sort the results + result, r = [], set() + for m in removed, added, modified, renamed: + r.update(m.keys()) + for k in sorted(r): + for m in removed, added, modified, renamed: + if k in m: + result.append(m[k]) + return result + + def getFolderTemplate(self, prefs, names): + # build command + args = [ prefs.getString('bzr_bin'), 'status', '-SV' ] + # build list of interesting files + pwd, isabs = os.path.abspath(os.curdir), False + for name in names: + isabs |= os.path.isabs(name) + args.append(utils.safeRelativePath(self.root, name, prefs, 'bzr_cygwin')) + # run command + prev = '-1' + fs = FolderSet(names) + added, modified, removed, renamed = {}, {}, {}, {} + for s in utils.popenReadLines(self.root, args, prefs, 'bzr_bash'): + # parse response + if len(s) < 5: + continue + y, k = s[1], s[4:] + if y == 'D': + # removed + k = prefs.convertToNativePath(k) + if not k.endswith(os.sep): + k = os.path.join(self.root, k) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + removed[k] = [ (k, prev), (None, None) ] + elif y == 'N': + # added + k = prefs.convertToNativePath(k) + if not k.endswith(os.sep): + k = os.path.join(self.root, k) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + added[k] = [ (None, None), (k, None) ] + elif y == 'M': + # modified or merge conflict + k = prefs.convertToNativePath(k) + if not k.endswith(os.sep): + k = os.path.join(self.root, k) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + modified[k] = self.getFileTemplate(prefs, k) + elif s[0] == 'R': + # renamed + k = k.split(' => ') + if len(k) == 2: + k0 = prefs.convertToNativePath(k[0]) + k1 = prefs.convertToNativePath(k[1]) + if not k0.endswith(os.sep) and not k1.endswith(os.sep): + k0 = os.path.join(self.root, k0) + k1 = os.path.join(self.root, k1) + if fs.contains(k0) or fs.contains(k1): + if not isabs: + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) + renamed[k1] = [ (k0, prev), (k1, None) ] + # sort the results + result, r = [], set() + for m in removed, added, modified, renamed: + r.update(m.keys()) + for k in sorted(r): + for m in removed, added, modified, renamed: + if k in m: + result.append(m[k]) + return result + + def getRevision(self, prefs, name, rev): + return utils.popenRead( + self.root, + [ + prefs.getString('bzr_bin'), + 'cat', + '--name-from-revision', + '-r', + rev, + utils.safeRelativePath(self.root, name, prefs, 'bzr_cygwin') + ], + prefs, + 'bzr_bash') From 890b202ba6d39a870b7f882118c337715b00043c Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 13:44:36 -0500 Subject: [PATCH 03/11] Convert CVS VCS --- src/main.py | 94 +---------------------------------------- src/vcs/cvs.py | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 92 deletions(-) create mode 100644 src/vcs/cvs.py diff --git a/src/main.py b/src/main.py index cab5108..22e4fcd 100644 --- a/src/main.py +++ b/src/main.py @@ -55,6 +55,7 @@ from diffuse import utils from diffuse import constants from diffuse.vcs.folder_set import FolderSet from diffuse.vcs.bzr import Bzr +from diffuse.vcs.cvs import Cvs from diffuse.vcs.git import Git if not hasattr(__builtins__, 'WindowsError'): @@ -1217,100 +1218,9 @@ def _get_bzr_repo(path, prefs): if p: return Bzr(p) -# CVS support -class _Cvs: - def __init__(self, root): - self.root = root - - def getFileTemplate(self, prefs, name): - return [ (name, 'BASE'), (name, None) ] - - def getCommitTemplate(self, prefs, rev, names): - result = [] - try: - r, prev = rev.split('.'), None - if len(r) > 1: - m = int(r.pop()) - if m > 1: - r.append(str(m - 1)) - else: - m = int(r.pop()) - if len(r): - prev = '.'.join(r) - for k in sorted(names): - if prev is None: - k0 = None - else: - k0 = k - result.append([ (k0, prev), (k, rev) ]) - except ValueError: - utils.logError(_('Error parsing revision %s.') % (rev, )) - return result - - def getFolderTemplate(self, prefs, names): - # build command - args = [ prefs.getString('cvs_bin'), '-nq', 'update', '-R' ] - # build list of interesting files - pwd, isabs = os.path.abspath(os.curdir), False - for name in names: - isabs |= os.path.isabs(name) - args.append(utils.safeRelativePath(self.root, name, prefs, 'cvs_cygwin')) - # run command - prev = 'BASE' - fs = FolderSet(names) - modified = {} - for s in utils.popenReadLines(self.root, args, prefs, 'cvs_bash'): - # parse response - if len(s) < 3 or s[0] not in 'ACMR': - continue - k = os.path.join(self.root, prefs.convertToNativePath(s[2:])) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - if s[0] == 'R': - # removed - modified[k] = [ (k, prev), (None, None) ] - pass - elif s[0] == 'A': - # added - modified[k] = [ (None, None), (k, None) ] - else: - # modified - modified[k] = [ (k, prev), (k, None) ] - # sort the results - return [ modified[k] for k in sorted(modified.keys()) ] - - def getRevision(self, prefs, name, rev): - if rev == 'BASE' and not os.path.exists(name): - # find revision for removed files - for s in utils.popenReadLines( - self.root, - [ - prefs.getString('cvs_bin'), - 'status', - utils.safeRelativePath(self.root, name, prefs, 'cvs_cygwin') - ], - prefs, - 'cvs_bash'): - if s.startswith(' Working revision:\t-'): - rev = s.split('\t')[1][1:] - return utils.popenRead( - self.root, - [ - prefs.getString('cvs_bin'), - '-Q', - 'update', - '-p', - '-r', - rev, - utils.safeRelativePath(self.root, name, prefs, 'cvs_cygwin') - ], - prefs, - 'cvs_bash') - def _get_cvs_repo(path, prefs): if os.path.isdir(os.path.join(path, 'CVS')): - return _Cvs(path) + return Cvs(path) # Darcs support class _Darcs: diff --git a/src/vcs/cvs.py b/src/vcs/cvs.py new file mode 100644 index 0000000..6b887bd --- /dev/null +++ b/src/vcs/cvs.py @@ -0,0 +1,112 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os + +from diffuse import utils +from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.vcs_interface import VcsInterface + +# CVS support +class Cvs(VcsInterface): + def getFileTemplate(self, prefs, name): + return [ (name, 'BASE'), (name, None) ] + + def getCommitTemplate(self, prefs, rev, names): + result = [] + try: + r, prev = rev.split('.'), None + if len(r) > 1: + m = int(r.pop()) + if m > 1: + r.append(str(m - 1)) + else: + m = int(r.pop()) + if len(r): + prev = '.'.join(r) + for k in sorted(names): + if prev is None: + k0 = None + else: + k0 = k + result.append([ (k0, prev), (k, rev) ]) + except ValueError: + utils.logError(_('Error parsing revision %s.') % (rev, )) + return result + + def getFolderTemplate(self, prefs, names): + # build command + args = [ prefs.getString('cvs_bin'), '-nq', 'update', '-R' ] + # build list of interesting files + pwd, isabs = os.path.abspath(os.curdir), False + for name in names: + isabs |= os.path.isabs(name) + args.append(utils.safeRelativePath(self.root, name, prefs, 'cvs_cygwin')) + # run command + prev = 'BASE' + fs = FolderSet(names) + modified = {} + for s in utils.popenReadLines(self.root, args, prefs, 'cvs_bash'): + # parse response + if len(s) < 3 or s[0] not in 'ACMR': + continue + k = os.path.join(self.root, prefs.convertToNativePath(s[2:])) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + if s[0] == 'R': + # removed + modified[k] = [ (k, prev), (None, None) ] + pass + elif s[0] == 'A': + # added + modified[k] = [ (None, None), (k, None) ] + else: + # modified + modified[k] = [ (k, prev), (k, None) ] + # sort the results + return [ modified[k] for k in sorted(modified.keys()) ] + + def getRevision(self, prefs, name, rev): + if rev == 'BASE' and not os.path.exists(name): + # find revision for removed files + for s in utils.popenReadLines( + self.root, + [ + prefs.getString('cvs_bin'), + 'status', + utils.safeRelativePath(self.root, name, prefs, 'cvs_cygwin') + ], + prefs, + 'cvs_bash'): + if s.startswith(' Working revision:\t-'): + rev = s.split('\t')[1][1:] + return utils.popenRead( + self.root, + [ + prefs.getString('cvs_bin'), + '-Q', + 'update', + '-p', + '-r', + rev, + utils.safeRelativePath(self.root, name, prefs, 'cvs_cygwin') + ], + prefs, + 'cvs_bash') From 85779843732b0f1c9690d2278f64cf14ed17b6f0 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 13:45:39 -0500 Subject: [PATCH 04/11] Convert Darcs VCS --- src/main.py | 126 +---------------------------------------- src/vcs/darcs.py | 144 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 124 deletions(-) create mode 100644 src/vcs/darcs.py diff --git a/src/main.py b/src/main.py index 22e4fcd..b602b3d 100644 --- a/src/main.py +++ b/src/main.py @@ -56,6 +56,7 @@ from diffuse import constants from diffuse.vcs.folder_set import FolderSet from diffuse.vcs.bzr import Bzr from diffuse.vcs.cvs import Cvs +from diffuse.vcs.darcs import Darcs from diffuse.vcs.git import Git if not hasattr(__builtins__, 'WindowsError'): @@ -1222,133 +1223,10 @@ def _get_cvs_repo(path, prefs): if os.path.isdir(os.path.join(path, 'CVS')): return Cvs(path) -# Darcs support -class _Darcs: - def __init__(self, root): - self.root = root - - def getFileTemplate(self, prefs, name): - return [ (name, ''), (name, None) ] - - def _getCommitTemplate(self, prefs, names, rev): - mods = (rev is None) - # build command - args = [ prefs.getString('darcs_bin') ] - if mods: - args.extend(['whatsnew', '-s']) - else: - args.extend(['log', '--number', '-s']) - try: - args.extend(['-n', str(int(rev))]) - except ValueError: - args.extend(['-h', rev]) - # build list of interesting files - pwd, isabs = os.path.abspath(os.curdir), False - for name in names: - isabs |= os.path.isabs(name) - if mods: - args.append(utils.safeRelativePath(self.root, name, prefs, 'darcs_cygwin')) - # run command - # 'darcs whatsnew' will return 1 if there are no changes - ss = utils.popenReadLines(self.root, args, prefs, 'darcs_bash', [0, 1]) - # parse response - i, n = 0, len(ss) - if mods: - prev = '' - rev = None - else: - try: - rev = ss[0].split(':')[0] - prev = str(int(rev) + 1) - # skip to the beginning of the summary - while i < n and len(ss[i]): - i += 1 - except (ValueError, IndexError): - i = n - fs = FolderSet(names) - added, modified, removed, renamed = {}, {}, {}, {} - while i < n: - s = ss[i] - i += 1 - if not mods: - if s.startswith(' '): - s = s[4:] - else: - continue - if len(s) < 2: - continue - x = s[0] - if x == 'R': - # removed - k = prefs.convertToNativePath(s[2:]) - if not k.endswith(os.sep): - k = os.path.join(self.root, k) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - removed[k] = [ (k, prev), (None, None) ] - elif x == 'A': - # added - k = prefs.convertToNativePath(s[2:]) - if not k.endswith(os.sep): - k = os.path.join(self.root, k) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - added[k] = [ (None, None), (k, rev) ] - elif x == 'M': - # modified - k = prefs.convertToNativePath(s[2:].split(' ')[0]) - if not k.endswith(os.sep): - k = os.path.join(self.root, k) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - if k not in renamed: - modified[k] = [ (k, prev), (k, rev) ] - elif x == ' ': - # renamed - k = s[1:].split(' -> ') - if len(k) == 2: - k0 = prefs.convertToNativePath(k[0]) - k1 = prefs.convertToNativePath(k[1]) - if not k0.endswith(os.sep): - k0 = os.path.join(self.root, k0) - k1 = os.path.join(self.root, k1) - if fs.contains(k0) or fs.contains(k1): - if not isabs: - k0 = utils.relpath(pwd, k0) - k1 = utils.relpath(pwd, k1) - renamed[k1] = [ (k0, prev), (k1, rev) ] - # sort the results - result, r = [], set() - for m in added, modified, removed, renamed: - r.update(m.keys()) - for k in sorted(r): - for m in removed, added, modified, renamed: - if k in m: - result.append(m[k]) - return result - - def getCommitTemplate(self, prefs, rev, names): - return self._getCommitTemplate(prefs, names, rev) - - def getFolderTemplate(self, prefs, names): - return self._getCommitTemplate(prefs, names, None) - - def getRevision(self, prefs, name, rev): - args = [ prefs.getString('darcs_bin'), 'show', 'contents' ] - try: - args.extend([ '-n', str(int(rev)) ]) - except ValueError: - args.extend([ '-h', rev ]) - args.append(utils.safeRelativePath(self.root, name, prefs, 'darcs_cygwin')) - return utils.popenRead(self.root, args, prefs, 'darcs_bash') - def _get_darcs_repo(path, prefs): p = _find_parent_dir_with(path, '_darcs') if p: - return _Darcs(p) + return Darcs(p) def _get_git_repo(path, prefs): if 'GIT_DIR' in os.environ: diff --git a/src/vcs/darcs.py b/src/vcs/darcs.py new file mode 100644 index 0000000..d5ef3bc --- /dev/null +++ b/src/vcs/darcs.py @@ -0,0 +1,144 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os + +from diffuse import utils +from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.vcs_interface import VcsInterface + +# Darcs support +class Darcs(VcsInterface): + def getFileTemplate(self, prefs, name): + return [ (name, ''), (name, None) ] + + def _getCommitTemplate(self, prefs, names, rev): + mods = (rev is None) + # build command + args = [ prefs.getString('darcs_bin') ] + if mods: + args.extend(['whatsnew', '-s']) + else: + args.extend(['log', '--number', '-s']) + try: + args.extend(['-n', str(int(rev))]) + except ValueError: + args.extend(['-h', rev]) + # build list of interesting files + pwd, isabs = os.path.abspath(os.curdir), False + for name in names: + isabs |= os.path.isabs(name) + if mods: + args.append(utils.safeRelativePath(self.root, name, prefs, 'darcs_cygwin')) + # run command + # 'darcs whatsnew' will return 1 if there are no changes + ss = utils.popenReadLines(self.root, args, prefs, 'darcs_bash', [0, 1]) + # parse response + i, n = 0, len(ss) + if mods: + prev = '' + rev = None + else: + try: + rev = ss[0].split(':')[0] + prev = str(int(rev) + 1) + # skip to the beginning of the summary + while i < n and len(ss[i]): + i += 1 + except (ValueError, IndexError): + i = n + fs = FolderSet(names) + added, modified, removed, renamed = {}, {}, {}, {} + while i < n: + s = ss[i] + i += 1 + if not mods: + if s.startswith(' '): + s = s[4:] + else: + continue + if len(s) < 2: + continue + x = s[0] + if x == 'R': + # removed + k = prefs.convertToNativePath(s[2:]) + if not k.endswith(os.sep): + k = os.path.join(self.root, k) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + removed[k] = [ (k, prev), (None, None) ] + elif x == 'A': + # added + k = prefs.convertToNativePath(s[2:]) + if not k.endswith(os.sep): + k = os.path.join(self.root, k) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + added[k] = [ (None, None), (k, rev) ] + elif x == 'M': + # modified + k = prefs.convertToNativePath(s[2:].split(' ')[0]) + if not k.endswith(os.sep): + k = os.path.join(self.root, k) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + if k not in renamed: + modified[k] = [ (k, prev), (k, rev) ] + elif x == ' ': + # renamed + k = s[1:].split(' -> ') + if len(k) == 2: + k0 = prefs.convertToNativePath(k[0]) + k1 = prefs.convertToNativePath(k[1]) + if not k0.endswith(os.sep): + k0 = os.path.join(self.root, k0) + k1 = os.path.join(self.root, k1) + if fs.contains(k0) or fs.contains(k1): + if not isabs: + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) + renamed[k1] = [ (k0, prev), (k1, rev) ] + # sort the results + result, r = [], set() + for m in added, modified, removed, renamed: + r.update(m.keys()) + for k in sorted(r): + for m in removed, added, modified, renamed: + if k in m: + result.append(m[k]) + return result + + def getCommitTemplate(self, prefs, rev, names): + return self._getCommitTemplate(prefs, names, rev) + + def getFolderTemplate(self, prefs, names): + return self._getCommitTemplate(prefs, names, None) + + def getRevision(self, prefs, name, rev): + args = [ prefs.getString('darcs_bin'), 'show', 'contents' ] + try: + args.extend([ '-n', str(int(rev)) ]) + except ValueError: + args.extend([ '-h', rev ]) + args.append(utils.safeRelativePath(self.root, name, prefs, 'darcs_cygwin')) + return utils.popenRead(self.root, args, prefs, 'darcs_bash') From 704579bf79acfca338cc1263c36d3cb8ec6db53a Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 13:49:05 -0500 Subject: [PATCH 05/11] Convert Hg VCS --- src/main.py | 79 +-------------------------------------- src/vcs/hg.py | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 77 deletions(-) create mode 100644 src/vcs/hg.py diff --git a/src/main.py b/src/main.py index b602b3d..1029c4a 100644 --- a/src/main.py +++ b/src/main.py @@ -58,6 +58,7 @@ from diffuse.vcs.bzr import Bzr from diffuse.vcs.cvs import Cvs from diffuse.vcs.darcs import Darcs from diffuse.vcs.git import Git +from diffuse.vcs.hg import Hg if not hasattr(__builtins__, 'WindowsError'): # define 'WindowsError' so 'except' statements will work on all platforms @@ -1262,86 +1263,10 @@ def _get_git_repo(path, prefs): break path = newpath -# Mercurial support -class _Hg: - def __init__(self, root): - self.root = root - self.working_rev = None - - def _getPreviousRevision(self, prefs, rev): - if rev is None: - if self.working_rev is None: - ss = utils.popenReadLines(self.root, [ prefs.getString('hg_bin'), 'id', '-i', '-t' ], prefs, 'hg_bash') - if len(ss) != 1: - raise IOError('Unknown working revision') - ss = ss[0].split(' ') - prev = ss[-1] - if len(ss) == 1 and prev.endswith('+'): - # remove local modifications indicator - prev = prev[:-1] - self.working_rev = prev - return self.working_rev - return f'p1({rev})' - - def getFileTemplate(self, prefs, name): - return [ (name, self._getPreviousRevision(prefs, None)), (name, None) ] - - def _getCommitTemplate(self, prefs, names, cmd, rev): - # build command - args = [ prefs.getString('hg_bin') ] - args.extend(cmd) - # build list of interesting files - pwd, isabs = os.path.abspath(os.curdir), False - for name in names: - isabs |= os.path.isabs(name) - args.append(utils.safeRelativePath(self.root, name, prefs, 'hg_cygwin')) - # run command - prev = self._getPreviousRevision(prefs, rev) - fs = FolderSet(names) - modified = {} - for s in utils.popenReadLines(self.root, args, prefs, 'hg_bash'): - # parse response - if len(s) < 3 or s[0] not in 'AMR': - continue - k = os.path.join(self.root, prefs.convertToNativePath(s[2:])) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - if s[0] == 'R': - # removed - modified[k] = [ (k, prev), (None, None) ] - elif s[0] == 'A': - # added - modified[k] = [ (None, None), (k, rev) ] - else: - # modified or merge conflict - modified[k] = [ (k, prev), (k, rev) ] - # sort the results - return [ modified[k] for k in sorted(modified.keys()) ] - - def getCommitTemplate(self, prefs, rev, names): - return self._getCommitTemplate(prefs, names, [ 'log', '--template', 'A\t{file_adds}\nM\t{file_mods}\nR\t{file_dels}\n', '-r', rev ], rev) - - def getFolderTemplate(self, prefs, names): - return self._getCommitTemplate(prefs, names, [ 'status', '-q' ], None) - - def getRevision(self, prefs, name, rev): - return utils.popenRead( - self.root, - [ - prefs.getString('hg_bin'), - 'cat', - '-r', - rev, - utils.safeRelativePath(self.root, name, prefs, 'hg_cygwin') - ], - prefs, - 'hg_bash') - def _get_hg_repo(path, prefs): p = _find_parent_dir_with(path, '.hg') if p: - return _Hg(p) + return Hg(p) # Monotone support class _Mtn: diff --git a/src/vcs/hg.py b/src/vcs/hg.py new file mode 100644 index 0000000..cd42d92 --- /dev/null +++ b/src/vcs/hg.py @@ -0,0 +1,100 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os + +from diffuse import utils +from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.vcs_interface import VcsInterface + +# Mercurial support +class Hg(VcsInterface): + def __init__(self, root): + VcsInterface.__init__(self, root) + self.working_rev = None + + def _getPreviousRevision(self, prefs, rev): + if rev is None: + if self.working_rev is None: + ss = utils.popenReadLines(self.root, [ prefs.getString('hg_bin'), 'id', '-i', '-t' ], prefs, 'hg_bash') + if len(ss) != 1: + raise IOError('Unknown working revision') + ss = ss[0].split(' ') + prev = ss[-1] + if len(ss) == 1 and prev.endswith('+'): + # remove local modifications indicator + prev = prev[:-1] + self.working_rev = prev + return self.working_rev + return f'p1({rev})' + + def getFileTemplate(self, prefs, name): + return [ (name, self._getPreviousRevision(prefs, None)), (name, None) ] + + def _getCommitTemplate(self, prefs, names, cmd, rev): + # build command + args = [ prefs.getString('hg_bin') ] + args.extend(cmd) + # build list of interesting files + pwd, isabs = os.path.abspath(os.curdir), False + for name in names: + isabs |= os.path.isabs(name) + args.append(utils.safeRelativePath(self.root, name, prefs, 'hg_cygwin')) + # run command + prev = self._getPreviousRevision(prefs, rev) + fs = FolderSet(names) + modified = {} + for s in utils.popenReadLines(self.root, args, prefs, 'hg_bash'): + # parse response + if len(s) < 3 or s[0] not in 'AMR': + continue + k = os.path.join(self.root, prefs.convertToNativePath(s[2:])) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + if s[0] == 'R': + # removed + modified[k] = [ (k, prev), (None, None) ] + elif s[0] == 'A': + # added + modified[k] = [ (None, None), (k, rev) ] + else: + # modified or merge conflict + modified[k] = [ (k, prev), (k, rev) ] + # sort the results + return [ modified[k] for k in sorted(modified.keys()) ] + + def getCommitTemplate(self, prefs, rev, names): + return self._getCommitTemplate(prefs, names, [ 'log', '--template', 'A\t{file_adds}\nM\t{file_mods}\nR\t{file_dels}\n', '-r', rev ], rev) + + def getFolderTemplate(self, prefs, names): + return self._getCommitTemplate(prefs, names, [ 'status', '-q' ], None) + + def getRevision(self, prefs, name, rev): + return utils.popenRead( + self.root, + [ + prefs.getString('hg_bin'), + 'cat', + '-r', + rev, + utils.safeRelativePath(self.root, name, prefs, 'hg_cygwin') + ], + prefs, + 'hg_bash') From 11fd364ef6811b2d059fadaecf03161b59ac7b86 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 13:57:49 -0500 Subject: [PATCH 06/11] Convert Monotone VCS --- src/main.py | 192 +------------------------------------------- src/vcs/mtn.py | 211 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 213 insertions(+), 190 deletions(-) create mode 100644 src/vcs/mtn.py diff --git a/src/main.py b/src/main.py index 1029c4a..e576307 100644 --- a/src/main.py +++ b/src/main.py @@ -59,6 +59,7 @@ from diffuse.vcs.cvs import Cvs from diffuse.vcs.darcs import Darcs from diffuse.vcs.git import Git from diffuse.vcs.hg import Hg +from diffuse.vcs.mtn import Mtn if not hasattr(__builtins__, 'WindowsError'): # define 'WindowsError' so 'except' statements will work on all platforms @@ -1268,199 +1269,10 @@ def _get_hg_repo(path, prefs): if p: return Hg(p) -# Monotone support -class _Mtn: - def __init__(self, root): - self.root = root - - def getFileTemplate(self, prefs, name): - # FIXME: merge conflicts? - return [ (name, 'h:'), (name, None) ] - - def getCommitTemplate(self, prefs, rev, names): - # build command - vcs_bin = prefs.getString('mtn_bin') - ss = utils.popenReadLines(self.root, [ vcs_bin, 'automate', 'select', '-q', rev ], prefs, 'mtn_bash') - if len(ss) != 1: - raise IOError('Ambiguous revision specifier') - args = [ vcs_bin, 'automate', 'get_revision', ss[0] ] - # build list of interesting files - fs = FolderSet(names) - pwd, isabs = os.path.abspath(os.curdir), False - for name in names: - isabs |= os.path.isabs(name) - # run command - prev = None - removed, added, modified, renamed = {}, {}, {}, {} - ss = utils.popenReadLines(self.root, args, prefs, 'mtn_bash') - i = 0 - while i < len(ss): - # process results - s = shlex.split(ss[i]) - i += 1 - if len(s) < 2: - continue - arg, arg1 = s[0], s[1] - if arg == 'old_revision' and len(arg1) > 2: - if prev is not None: - break - prev = arg1[1:-1] - continue - elif prev is None: - continue - if arg == 'delete': - # deleted file - k = os.path.join(self.root, prefs.convertToNativePath(arg1)) - if fs.contains(k): - removed[arg1] = k - elif arg == 'add_file': - # new file - k = os.path.join(self.root, prefs.convertToNativePath(arg1)) - if fs.contains(k): - added[arg1] = k - elif arg == 'patch': - # modified file - k = os.path.join(self.root, prefs.convertToNativePath(arg1)) - if fs.contains(k): - modified[arg1] = k - elif arg == 'rename': - s = shlex.split(ss[i]) - i += 1 - if len(s) > 1 and s[0] == 'to': - # renamed file - k0 = os.path.join(self.root, prefs.convertToNativePath(arg1)) - k1 = os.path.join(self.root, prefs.convertToNativePath(s[1])) - if fs.contains(k0) or fs.contains(k1): - renamed[s[1]] = (arg1, k0, k1) - if removed or renamed: - # remove directories - removed_dirs = set() - for s in utils.popenReadLines(self.root, [ vcs_bin, 'automate', 'get_manifest_of', prev ], prefs, 'mtn_bash'): - s = shlex.split(s) - if len(s) > 1 and s[0] == 'dir': - removed_dirs.add(s[1]) - for k in removed_dirs: - for m in removed, modified: - if k in m: - del m[k] - for k, v in renamed.items(): - arg1, k0, k1 = v - if arg1 in removed_dirs: - del renamed[k] - # sort results - result, r = [], set() - for m in removed, added, modified, renamed: - r.update(m) - for k in sorted(r): - if k in removed: - k = removed[k] - if not isabs: - k = utils.relpath(pwd, k) - result.append([ (k, prev), (None, None) ]) - elif k in added: - k = added[k] - if not isabs: - k = utils.relpath(pwd, k) - result.append([ (None, None), (k, rev) ]) - else: - if k in renamed: - arg1, k0, k1 = renamed[k] - else: - k0 = k1 = modified[k] - if not isabs: - k0 = utils.relpath(pwd, k0) - k1 = utils.relpath(pwd, k1) - result.append([ (k0, prev), (k1, rev) ]) - return result - - def getFolderTemplate(self, prefs, names): - fs = FolderSet(names) - result = [] - pwd, isabs = os.path.abspath(os.curdir), False - args = [ prefs.getString('mtn_bin'), 'automate', 'inventory', '--no-ignored', '--no-unchanged', '--no-unknown' ] - for name in names: - isabs |= os.path.isabs(name) - # build list of interesting files - prev = 'h:' - ss = utils.popenReadLines(self.root, args, prefs, 'mtn_bash') - removed, added, modified, renamed = {}, {}, {}, {} - i = 0 - while i < len(ss): - # parse properties - m = {} - while i < len(ss): - s = ss[i] - i += 1 - # properties are terminated by a blank line - s = shlex.split(s) - if len(s) == 0: - break - m[s[0]] = s[1:] - # scan the list of properties for files that interest us - if len(m.get('path', [])) > 0: - p, s, processed = m['path'][0], m.get('status', []), False - if 'dropped' in s and 'file' in m.get('old_type', []): - # deleted file - k = os.path.join(self.root, prefs.convertToNativePath(p)) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - removed[k] = [ (k, prev), (None, None) ] - processed = True - if 'added' in s and 'file' in m.get('new_type', []): - # new file - k = os.path.join(self.root, prefs.convertToNativePath(p)) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - added[k] = [ (None, None), (k, None) ] - processed = True - if 'rename_target' in s and 'file' in m.get('new_type', []) and len(m.get('old_path', [])) > 0: - # renamed file - k0 = os.path.join(self.root, prefs.convertToNativePath(m['old_path'][0])) - k1 = os.path.join(self.root, prefs.convertToNativePath(p)) - if fs.contains(k0) or fs.contains(k1): - if not isabs: - k0 = utils.relpath(pwd, k0) - k1 = utils.relpath(pwd, k1) - renamed[k1] = [ (k0, prev), (k1, None) ] - processed = True - if not processed and 'file' in m.get('fs_type', []): - # modified file or merge conflict - k = os.path.join(self.root, prefs.convertToNativePath(p)) - if fs.contains(k): - if not isabs: - k = utils.relpath(pwd, k) - modified[k] = [ (k, prev), (k, None) ] - # sort the results - r = set() - for m in removed, added, modified, renamed: - r.update(m.keys()) - for k in sorted(r): - for m in removed, added, modified, renamed: - if k in m: - result.append(m[k]) - return result - - def getRevision(self, prefs, name, rev): - return utils.popenRead( - self.root, - [ - prefs.getString('mtn_bin'), - 'automate', - 'get_file_of', - '-q', - '-r', - rev, - utils.safeRelativePath(self.root, name, prefs, 'mtn_cygwin') - ], - prefs, - 'mtn_bash') - def _get_mtn_repo(path, prefs): p = _find_parent_dir_with(path, '_MTN') if p: - return _Mtn(p) + return Mtn(p) # RCS support class _Rcs: diff --git a/src/vcs/mtn.py b/src/vcs/mtn.py new file mode 100644 index 0000000..f70f6f4 --- /dev/null +++ b/src/vcs/mtn.py @@ -0,0 +1,211 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os +import shlex + +from diffuse import utils +from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.vcs_interface import VcsInterface + +# Monotone support +class Mtn(VcsInterface): + def getFileTemplate(self, prefs, name): + # FIXME: merge conflicts? + return [ (name, 'h:'), (name, None) ] + + def getCommitTemplate(self, prefs, rev, names): + # build command + vcs_bin = prefs.getString('mtn_bin') + ss = utils.popenReadLines(self.root, [ vcs_bin, 'automate', 'select', '-q', rev ], prefs, 'mtn_bash') + if len(ss) != 1: + raise IOError('Ambiguous revision specifier') + args = [ vcs_bin, 'automate', 'get_revision', ss[0] ] + # build list of interesting files + fs = FolderSet(names) + pwd, isabs = os.path.abspath(os.curdir), False + for name in names: + isabs |= os.path.isabs(name) + # run command + prev = None + removed, added, modified, renamed = {}, {}, {}, {} + ss = utils.popenReadLines(self.root, args, prefs, 'mtn_bash') + i = 0 + while i < len(ss): + # process results + s = shlex.split(ss[i]) + i += 1 + if len(s) < 2: + continue + arg, arg1 = s[0], s[1] + if arg == 'old_revision' and len(arg1) > 2: + if prev is not None: + break + prev = arg1[1:-1] + continue + elif prev is None: + continue + if arg == 'delete': + # deleted file + k = os.path.join(self.root, prefs.convertToNativePath(arg1)) + if fs.contains(k): + removed[arg1] = k + elif arg == 'add_file': + # new file + k = os.path.join(self.root, prefs.convertToNativePath(arg1)) + if fs.contains(k): + added[arg1] = k + elif arg == 'patch': + # modified file + k = os.path.join(self.root, prefs.convertToNativePath(arg1)) + if fs.contains(k): + modified[arg1] = k + elif arg == 'rename': + s = shlex.split(ss[i]) + i += 1 + if len(s) > 1 and s[0] == 'to': + # renamed file + k0 = os.path.join(self.root, prefs.convertToNativePath(arg1)) + k1 = os.path.join(self.root, prefs.convertToNativePath(s[1])) + if fs.contains(k0) or fs.contains(k1): + renamed[s[1]] = (arg1, k0, k1) + if removed or renamed: + # remove directories + removed_dirs = set() + for s in utils.popenReadLines(self.root, [ vcs_bin, 'automate', 'get_manifest_of', prev ], prefs, 'mtn_bash'): + s = shlex.split(s) + if len(s) > 1 and s[0] == 'dir': + removed_dirs.add(s[1]) + for k in removed_dirs: + for m in removed, modified: + if k in m: + del m[k] + for k, v in renamed.items(): + arg1, k0, k1 = v + if arg1 in removed_dirs: + del renamed[k] + # sort results + result, r = [], set() + for m in removed, added, modified, renamed: + r.update(m) + for k in sorted(r): + if k in removed: + k = removed[k] + if not isabs: + k = utils.relpath(pwd, k) + result.append([ (k, prev), (None, None) ]) + elif k in added: + k = added[k] + if not isabs: + k = utils.relpath(pwd, k) + result.append([ (None, None), (k, rev) ]) + else: + if k in renamed: + arg1, k0, k1 = renamed[k] + else: + k0 = k1 = modified[k] + if not isabs: + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) + result.append([ (k0, prev), (k1, rev) ]) + return result + + def getFolderTemplate(self, prefs, names): + fs = FolderSet(names) + result = [] + pwd, isabs = os.path.abspath(os.curdir), False + args = [ prefs.getString('mtn_bin'), 'automate', 'inventory', '--no-ignored', '--no-unchanged', '--no-unknown' ] + for name in names: + isabs |= os.path.isabs(name) + # build list of interesting files + prev = 'h:' + ss = utils.popenReadLines(self.root, args, prefs, 'mtn_bash') + removed, added, modified, renamed = {}, {}, {}, {} + i = 0 + while i < len(ss): + # parse properties + m = {} + while i < len(ss): + s = ss[i] + i += 1 + # properties are terminated by a blank line + s = shlex.split(s) + if len(s) == 0: + break + m[s[0]] = s[1:] + # scan the list of properties for files that interest us + if len(m.get('path', [])) > 0: + p, s, processed = m['path'][0], m.get('status', []), False + if 'dropped' in s and 'file' in m.get('old_type', []): + # deleted file + k = os.path.join(self.root, prefs.convertToNativePath(p)) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + removed[k] = [ (k, prev), (None, None) ] + processed = True + if 'added' in s and 'file' in m.get('new_type', []): + # new file + k = os.path.join(self.root, prefs.convertToNativePath(p)) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + added[k] = [ (None, None), (k, None) ] + processed = True + if 'rename_target' in s and 'file' in m.get('new_type', []) and len(m.get('old_path', [])) > 0: + # renamed file + k0 = os.path.join(self.root, prefs.convertToNativePath(m['old_path'][0])) + k1 = os.path.join(self.root, prefs.convertToNativePath(p)) + if fs.contains(k0) or fs.contains(k1): + if not isabs: + k0 = utils.relpath(pwd, k0) + k1 = utils.relpath(pwd, k1) + renamed[k1] = [ (k0, prev), (k1, None) ] + processed = True + if not processed and 'file' in m.get('fs_type', []): + # modified file or merge conflict + k = os.path.join(self.root, prefs.convertToNativePath(p)) + if fs.contains(k): + if not isabs: + k = utils.relpath(pwd, k) + modified[k] = [ (k, prev), (k, None) ] + # sort the results + r = set() + for m in removed, added, modified, renamed: + r.update(m.keys()) + for k in sorted(r): + for m in removed, added, modified, renamed: + if k in m: + result.append(m[k]) + return result + + def getRevision(self, prefs, name, rev): + return utils.popenRead( + self.root, + [ + prefs.getString('mtn_bin'), + 'automate', + 'get_file_of', + '-q', + '-r', + rev, + utils.safeRelativePath(self.root, name, prefs, 'mtn_cygwin') + ], + prefs, + 'mtn_bash') From f314f46309f84dc927357357423c4d8d83a47f44 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 14:01:00 -0500 Subject: [PATCH 07/11] Convert Rcs VCS --- src/main.py | 114 ++----------------------------------------- src/vcs/rcs.py | 129 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 111 deletions(-) create mode 100644 src/vcs/rcs.py diff --git a/src/main.py b/src/main.py index e576307..3040cf4 100644 --- a/src/main.py +++ b/src/main.py @@ -60,6 +60,7 @@ from diffuse.vcs.darcs import Darcs from diffuse.vcs.git import Git from diffuse.vcs.hg import Hg from diffuse.vcs.mtn import Mtn +from diffuse.vcs.rcs import Rcs if not hasattr(__builtins__, 'WindowsError'): # define 'WindowsError' so 'except' statements will work on all platforms @@ -1274,118 +1275,9 @@ def _get_mtn_repo(path, prefs): if p: return Mtn(p) -# RCS support -class _Rcs: - def __init__(self, root): - self.root = root - - def getFileTemplate(self, prefs, name): - args = [ prefs.getString('rcs_bin_rlog'), '-L', '-h', utils.safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ] - rev = '' - for line in utils.popenReadLines(self.root, args, prefs, 'rcs_bash'): - if line.startswith('head: '): - rev = line[6:] - return [ (name, rev), (name, None) ] - - def getCommitTemplate(self, prefs, rev, names): - result = [] - try: - r, prev = rev.split('.'), None - if len(r) > 1: - m = int(r.pop()) - if m > 1: - r.append(str(m - 1)) - else: - m = int(r.pop()) - if len(r): - prev = '.'.join(r) - for k in sorted(names): - if prev is None: - k0 = None - else: - k0 = k - result.append([ (k0, prev), (k, rev) ]) - except ValueError: - utils.logError(_('Error parsing revision %s.') % (rev, )) - return result - - def getFolderTemplate(self, prefs, names): - # build command - cmd = [ prefs.getString('rcs_bin_rlog'), '-L', '-h' ] - # build list of interesting files - pwd, isabs = os.path.abspath(os.curdir), False - r = [] - for k in names: - if os.path.isdir(k): - # the user specified a folder - n, ex = [ k ], True - while len(n) > 0: - s = n.pop() - recurse = os.path.isdir(os.path.join(s, 'RCS')) - if ex or recurse: - ex = False - for v in os.listdir(s): - dn = os.path.join(s, v) - if v.endswith(',v') and os.path.isfile(dn): - # map to checkout name - r.append(dn[:-2]) - elif v == 'RCS' and os.path.isdir(dn): - for v in os.listdir(dn): - if os.path.isfile(os.path.join(dn, v)): - if v.endswith(',v'): - v = v[:-2] - r.append(os.path.join(s, v)) - elif recurse and os.path.isdir(dn) and not os.path.islink(dn): - n.append(dn) - else: - # the user specified a file - s = k + ',v' - if os.path.isfile(s): - r.append(k) - continue - s = k.split(os.sep) - s.insert(-1, 'RCS') - # old-style RCS repository - if os.path.isfile(os.sep.join(s)): - r.append(k) - continue - # new-style RCS repository - s[-1] += ',v' - if os.path.isfile(os.sep.join(s)): - r.append(k) - for k in r: - isabs |= os.path.isabs(k) - args = [ utils.safeRelativePath(self.root, k, prefs, 'rcs_cygwin') for k in r ] - # run command - r, k = {}, '' - for line in utils.popenXArgsReadLines(self.root, cmd, args, prefs, 'rcs_bash'): - # parse response - if line.startswith('Working file: '): - k = prefs.convertToNativePath(line[14:]) - k = os.path.join(self.root, os.path.normpath(k)) - if not isabs: - k = utils.relpath(pwd, k) - elif line.startswith('head: '): - r[k] = line[6:] - # sort the results - return [ [ (k, r[k]), (k, None) ] for k in sorted(r.keys()) ] - - def getRevision(self, prefs, name, rev): - return utils.popenRead( - self.root, - [ - prefs.getString('rcs_bin_co'), - '-p', - '-q', - '-r' + rev, - utils.safeRelativePath(self.root, name, prefs, 'rcs_cygwin') - ], - prefs, - 'rcs_bash') - def _get_rcs_repo(path, prefs): if os.path.isdir(os.path.join(path, 'RCS')): - return _Rcs(path) + return Rcs(path) # [rfailliot] this code doesn't seem to work, but was in 0.4.8 too. # I'm letting it here until further tests are done, but it is possible @@ -1393,7 +1285,7 @@ def _get_rcs_repo(path, prefs): try: for s in os.listdir(path): if s.endswith(',v') and os.path.isfile(os.path.join(path, s)): - return _Rcs(path) + return Rcs(path) except OSError: # the user specified an invalid folder name pass diff --git a/src/vcs/rcs.py b/src/vcs/rcs.py new file mode 100644 index 0000000..e8ed73c --- /dev/null +++ b/src/vcs/rcs.py @@ -0,0 +1,129 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os + +from diffuse import utils +from diffuse.vcs.vcs_interface import VcsInterface + +# RCS support +class Rcs(VcsInterface): + def getFileTemplate(self, prefs, name): + args = [ prefs.getString('rcs_bin_rlog'), '-L', '-h', utils.safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ] + rev = '' + for line in utils.popenReadLines(self.root, args, prefs, 'rcs_bash'): + if line.startswith('head: '): + rev = line[6:] + return [ (name, rev), (name, None) ] + + def getCommitTemplate(self, prefs, rev, names): + result = [] + try: + r, prev = rev.split('.'), None + if len(r) > 1: + m = int(r.pop()) + if m > 1: + r.append(str(m - 1)) + else: + m = int(r.pop()) + if len(r): + prev = '.'.join(r) + for k in sorted(names): + if prev is None: + k0 = None + else: + k0 = k + result.append([ (k0, prev), (k, rev) ]) + except ValueError: + utils.logError(_('Error parsing revision %s.') % (rev, )) + return result + + def getFolderTemplate(self, prefs, names): + # build command + cmd = [ prefs.getString('rcs_bin_rlog'), '-L', '-h' ] + # build list of interesting files + pwd, isabs = os.path.abspath(os.curdir), False + r = [] + for k in names: + if os.path.isdir(k): + # the user specified a folder + n, ex = [ k ], True + while len(n) > 0: + s = n.pop() + recurse = os.path.isdir(os.path.join(s, 'RCS')) + if ex or recurse: + ex = False + for v in os.listdir(s): + dn = os.path.join(s, v) + if v.endswith(',v') and os.path.isfile(dn): + # map to checkout name + r.append(dn[:-2]) + elif v == 'RCS' and os.path.isdir(dn): + for v in os.listdir(dn): + if os.path.isfile(os.path.join(dn, v)): + if v.endswith(',v'): + v = v[:-2] + r.append(os.path.join(s, v)) + elif recurse and os.path.isdir(dn) and not os.path.islink(dn): + n.append(dn) + else: + # the user specified a file + s = k + ',v' + if os.path.isfile(s): + r.append(k) + continue + s = k.split(os.sep) + s.insert(-1, 'RCS') + # old-style RCS repository + if os.path.isfile(os.sep.join(s)): + r.append(k) + continue + # new-style RCS repository + s[-1] += ',v' + if os.path.isfile(os.sep.join(s)): + r.append(k) + for k in r: + isabs |= os.path.isabs(k) + args = [ utils.safeRelativePath(self.root, k, prefs, 'rcs_cygwin') for k in r ] + # run command + r, k = {}, '' + for line in utils.popenXArgsReadLines(self.root, cmd, args, prefs, 'rcs_bash'): + # parse response + if line.startswith('Working file: '): + k = prefs.convertToNativePath(line[14:]) + k = os.path.join(self.root, os.path.normpath(k)) + if not isabs: + k = utils.relpath(pwd, k) + elif line.startswith('head: '): + r[k] = line[6:] + # sort the results + return [ [ (k, r[k]), (k, None) ] for k in sorted(r.keys()) ] + + def getRevision(self, prefs, name, rev): + return utils.popenRead( + self.root, + [ + prefs.getString('rcs_bin_co'), + '-p', + '-q', + '-r' + rev, + utils.safeRelativePath(self.root, name, prefs, 'rcs_cygwin') + ], + prefs, + 'rcs_bash') From 5d6ece84e148b811340844a23573272f661e0444 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 14:12:37 -0500 Subject: [PATCH 08/11] Convert Svn VCS --- src/main.py | 242 +--------------------------------------------- src/utils.py | 5 + src/vcs/svn.py | 257 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 239 deletions(-) create mode 100644 src/vcs/svn.py diff --git a/src/main.py b/src/main.py index 3040cf4..201fe55 100644 --- a/src/main.py +++ b/src/main.py @@ -61,6 +61,7 @@ from diffuse.vcs.git import Git from diffuse.vcs.hg import Hg from diffuse.vcs.mtn import Mtn from diffuse.vcs.rcs import Rcs +from diffuse.vcs.svn import Svn if not hasattr(__builtins__, 'WindowsError'): # define 'WindowsError' so 'except' statements will work on all platforms @@ -70,11 +71,6 @@ if not hasattr(__builtins__, 'WindowsError'): # this is sorted based upon frequency to speed up code for stripping whitespace whitespace = ' \t\n\r\x0b\x0c' -# escape special glob characters -def globEscape(s): - m = dict([ (c, f'[{c}]') for c in '[]?*' ]) - return ''.join([ m.get(c, c) for c in s ]) - # colour resources class Colour: def __init__(self, r, g, b, a=1.0): @@ -495,7 +491,7 @@ class Resources: if args[0] == 'import' and len(args) == 2: path = os.path.expanduser(args[1]) # relative paths are relative to the parsed file - path = os.path.join(globEscape(os.path.dirname(file_name)), path) + path = os.path.join(utils.globEscape(os.path.dirname(file_name)), path) paths = glob.glob(path) if len(paths) == 0: paths = [ path ] @@ -1290,242 +1286,10 @@ def _get_rcs_repo(path, prefs): # the user specified an invalid folder name pass -# Subversion support -# SVK support subclasses from this -class _Svn: - def __init__(self, root): - self.root = root - self.url = None - - def _getVcs(self): - return 'svn' - - 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 utils.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 - escaped_name = globEscape(name) - left = glob.glob(escaped_name + '.merge-left.r*') - right = glob.glob(escaped_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(escaped_name + '.r*')) - right = glob.glob(escaped_name + '.mine') - right.extend(glob.glob(escaped_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: - utils.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(utils.safeRelativePath(self.root, name, prefs, vcs + '_cygwin')) - # run command - fs = FolderSet(names) - modified, added, removed = {}, set(), set() - for s in utils.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 "svn diff --summarize -c " - 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 = utils.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 = utils.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 utils.popenReadLines(self.root, [ vcs_bin, 'list', '-r', rev, '{}/{}'.format(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 = utils.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 = utils.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 utils.popenReadLines(self.root, [ vcs_bin, 'list', '-r', prev, '{}/{}'.format(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 = utils.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 utils.popenReadLines(self.root, [ vcs_bin, 'list', '-r', prev, '{}/{}'.format(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 = utils.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): - vcs_bin = prefs.getString('svn_bin') - if rev in [ 'BASE', 'COMMITTED', 'PREV' ]: - return utils.popenRead( - self.root, - [ - vcs_bin, - 'cat', - '{}@{}'.format(utils.safeRelativePath(self.root, name, prefs, 'svn_cygwin'), rev) - ], - prefs, - 'svn_bash') - return utils.popenRead( - self.root, - [ - vcs_bin, - 'cat', - '{}/{}@{}'.format( - self._getURL(prefs), - utils.relpath(self.root, os.path.abspath(name)).replace(os.sep, '/'), - rev) - ], - prefs, - 'svn_bash') - def _get_svn_repo(path, prefs): p = _find_parent_dir_with(path, '.svn') if p: - return _Svn(p) + return Svn(p) class _Svk(_Svn): def __init__(self, root): diff --git a/src/utils.py b/src/utils.py index 9ab73f2..9428c07 100644 --- a/src/utils.py +++ b/src/utils.py @@ -166,6 +166,11 @@ def popenXArgsReadLines(dn, cmd, args, prefs, bash_pref): s, a = 0, [] return ss +# escape special glob characters +def globEscape(s): + m = dict([ (c, f'[{c}]') for c in '[]?*' ]) + return ''.join([ m.get(c, c) for c in s ]) + # use the program's location as a starting place to search for supporting files # such as icon and help documentation if hasattr(sys, 'frozen'): diff --git a/src/vcs/svn.py b/src/vcs/svn.py new file mode 100644 index 0000000..b6d3ca7 --- /dev/null +++ b/src/vcs/svn.py @@ -0,0 +1,257 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os +import glob + +from diffuse import utils +from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.vcs_interface import VcsInterface + +# Subversion support +# SVK support subclasses from this +class Svn(VcsInterface): + def __init__(self, root): + VcsInterface.__init__(self, root) + self.url = None + + def _getVcs(self): + return 'svn' + + 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 utils.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 + escaped_name = utils.globEscape(name) + left = glob.glob(escaped_name + '.merge-left.r*') + right = glob.glob(escaped_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(escaped_name + '.r*')) + right = glob.glob(escaped_name + '.mine') + right.extend(glob.glob(escaped_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: + utils.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(utils.safeRelativePath(self.root, name, prefs, vcs + '_cygwin')) + # run command + fs = FolderSet(names) + modified, added, removed = {}, set(), set() + for s in utils.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 "svn diff --summarize -c " + 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 = utils.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 = utils.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 utils.popenReadLines(self.root, [ vcs_bin, 'list', '-r', rev, '{}/{}'.format(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 = utils.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 = utils.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 utils.popenReadLines(self.root, [ vcs_bin, 'list', '-r', prev, '{}/{}'.format(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 = utils.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 utils.popenReadLines(self.root, [ vcs_bin, 'list', '-r', prev, '{}/{}'.format(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 = utils.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): + vcs_bin = prefs.getString('svn_bin') + if rev in [ 'BASE', 'COMMITTED', 'PREV' ]: + return utils.popenRead( + self.root, + [ + vcs_bin, + 'cat', + '{}@{}'.format(utils.safeRelativePath(self.root, name, prefs, 'svn_cygwin'), rev) + ], + prefs, + 'svn_bash') + return utils.popenRead( + self.root, + [ + vcs_bin, + 'cat', + '{}/{}@{}'.format( + self._getURL(prefs), + utils.relpath(self.root, os.path.abspath(name)).replace(os.sep, '/'), + rev) + ], + prefs, + 'svn_bash') From ab25807876e85c09be70f78378557f4117292a3c Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 14:14:57 -0500 Subject: [PATCH 09/11] Convert Svk VCS --- src/main.py | 40 ++-------------------------------- src/vcs/svk.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 38 deletions(-) create mode 100644 src/vcs/svk.py diff --git a/src/main.py b/src/main.py index 201fe55..fbee217 100644 --- a/src/main.py +++ b/src/main.py @@ -61,6 +61,7 @@ from diffuse.vcs.git import Git from diffuse.vcs.hg import Hg from diffuse.vcs.mtn import Mtn from diffuse.vcs.rcs import Rcs +from diffuse.vcs.svk import Svk from diffuse.vcs.svn import Svn if not hasattr(__builtins__, 'WindowsError'): @@ -1291,43 +1292,6 @@ def _get_svn_repo(path, prefs): if p: return Svn(p) -class _Svk(_Svn): - def __init__(self, root): - _Svn.__init__(self, root) - - def _getVcs(self): - return 'svk' - - def _getURLPrefix(self): - return 'Depot Path: ' - - def _parseStatusLine(self, s): - if len(s) < 4 or s[0] not in 'ACDMR': - return - return s[0], s[4:] - - def _getPreviousRevision(self, rev): - if rev is None: - return 'HEAD' - if rev.endswith('@'): - return str(int(rev[:-1]) - 1) + '@' - return str(int(rev) - 1) - - def getRevision(self, prefs, name, rev): - return utils.popenRead( - self.root, - [ - prefs.getString('svk_bin'), - 'cat', - '-r', - rev, - '{}/{}'.format( - self._getURL(prefs), - utils.relpath(self.root, os.path.abspath(name)).replace(os.sep, '/')) - ], - prefs, - 'svk_bash') - def _get_svk_repo(path, prefs): name = path # parse the ~/.svk/config file to discover which directories are part of @@ -1386,7 +1350,7 @@ def _get_svk_repo(path, prefs): break # check if the file belongs to one of the project directories if FolderSet(projs).contains(name): - return _Svk(path) + return Svk(path) except IOError: utils.logError(_('Error parsing %s.') % (svkconfig, )) diff --git a/src/vcs/svk.py b/src/vcs/svk.py new file mode 100644 index 0000000..4ee1696 --- /dev/null +++ b/src/vcs/svk.py @@ -0,0 +1,58 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os +import glob + +from diffuse import utils +from diffuse.vcs.svn import Svn + +class Svk(Svn): + def _getVcs(self): + return 'svk' + + def _getURLPrefix(self): + return 'Depot Path: ' + + def _parseStatusLine(self, s): + if len(s) < 4 or s[0] not in 'ACDMR': + return + return s[0], s[4:] + + def _getPreviousRevision(self, rev): + if rev is None: + return 'HEAD' + if rev.endswith('@'): + return str(int(rev[:-1]) - 1) + '@' + return str(int(rev) - 1) + + def getRevision(self, prefs, name, rev): + return utils.popenRead( + self.root, + [ + prefs.getString('svk_bin'), + 'cat', + '-r', + rev, + '{}/{}'.format( + self._getURL(prefs), + utils.relpath(self.root, os.path.abspath(name)).replace(os.sep, '/')) + ], + prefs, + 'svk_bash') From db36eee4e322c8979e6008cae6a9b2e26c61b22c Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 14:37:42 -0500 Subject: [PATCH 10/11] Convert VCSs and rename to VcsRegistry --- src/main.py | 197 +----------------------------------- src/utils.py | 11 ++ src/vcs/vcs_registry.py | 216 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 229 insertions(+), 195 deletions(-) create mode 100644 src/vcs/vcs_registry.py diff --git a/src/main.py b/src/main.py index fbee217..b291b19 100644 --- a/src/main.py +++ b/src/main.py @@ -53,16 +53,7 @@ from urllib.parse import urlparse from diffuse import utils from diffuse import constants -from diffuse.vcs.folder_set import FolderSet -from diffuse.vcs.bzr import Bzr -from diffuse.vcs.cvs import Cvs -from diffuse.vcs.darcs import Darcs -from diffuse.vcs.git import Git -from diffuse.vcs.hg import Hg -from diffuse.vcs.mtn import Mtn -from diffuse.vcs.rcs import Rcs -from diffuse.vcs.svk import Svk -from diffuse.vcs.svn import Svn +from diffuse.vcs.vcs_registry import VcsRegistry if not hasattr(__builtins__, 'WindowsError'): # define 'WindowsError' so 'except' statements will work on all platforms @@ -1192,191 +1183,7 @@ def convert_to_format(s, format): s += '\r' return s -# returns the Windows drive or share from a from an absolute path -def drive_from_path(s): - c = s.split(os.sep) - if len(c) > 3 and c[0] == '' and c[1] == '': - return os.path.join(c[:4]) - return c[0] - -# escape arguments for use with bash -def bashEscape(s): - return "'" + s.replace("'", "'\\''") + "'" - -# utility method to help find folders used by version control systems -def _find_parent_dir_with(path, dir_name): - while True: - name = os.path.join(path, dir_name) - if os.path.isdir(name): - return path - newpath = os.path.dirname(path) - if newpath == path: - break - path = newpath - -def _get_bzr_repo(path, prefs): - p = _find_parent_dir_with(path, '.bzr') - if p: - return Bzr(p) - -def _get_cvs_repo(path, prefs): - if os.path.isdir(os.path.join(path, 'CVS')): - return Cvs(path) - -def _get_darcs_repo(path, prefs): - p = _find_parent_dir_with(path, '_darcs') - if p: - return Darcs(p) - -def _get_git_repo(path, prefs): - if 'GIT_DIR' in os.environ: - try: - d = path - ss = utils.popenReadLines(d, [ prefs.getString('git_bin'), 'rev-parse', '--show-prefix' ], prefs, 'git_bash') - if len(ss) > 0: - # be careful to handle trailing slashes - d = d.split(os.sep) - if d[-1] != '': - d.append('') - ss = strip_eol(ss[0]).split('/') - if ss[-1] != '': - ss.append('') - n = len(ss) - if n <= len(d): - del d[-n:] - if len(d) == 0: - d = os.curdir - else: - d = os.sep.join(d) - return Git(d) - except (IOError, OSError, WindowsError): - # working tree not found - pass - # search for .git directory (project) or .git file (submodule) - while True: - name = os.path.join(path, '.git') - if os.path.isdir(name) or os.path.isfile(name): - return Git(path) - newpath = os.path.dirname(path) - if newpath == path: - break - path = newpath - -def _get_hg_repo(path, prefs): - p = _find_parent_dir_with(path, '.hg') - if p: - return Hg(p) - -def _get_mtn_repo(path, prefs): - p = _find_parent_dir_with(path, '_MTN') - if p: - return Mtn(p) - -def _get_rcs_repo(path, prefs): - if os.path.isdir(os.path.join(path, 'RCS')): - return Rcs(path) - - # [rfailliot] this code doesn't seem to work, but was in 0.4.8 too. - # I'm letting it here until further tests are done, but it is possible - # this code never actually worked. - try: - for s in os.listdir(path): - if s.endswith(',v') and os.path.isfile(os.path.join(path, s)): - return Rcs(path) - except OSError: - # the user specified an invalid folder name - pass - -def _get_svn_repo(path, prefs): - p = _find_parent_dir_with(path, '.svn') - if p: - return Svn(p) - -def _get_svk_repo(path, prefs): - name = path - # parse the ~/.svk/config file to discover which directories are part of - # SVK repositories - if utils.isWindows(): - name = name.upper() - svkroot = os.environ.get('SVKROOT', None) - if svkroot is None: - svkroot = os.path.expanduser('~/.svk') - svkconfig = os.path.join(svkroot, 'config') - if os.path.isfile(svkconfig): - try: - # find working copies by parsing the config file - f = open(svkconfig, 'r') - ss = readlines(f) - f.close() - projs, sep = [], os.sep - # find the separator character - for s in ss: - if s.startswith(' sep: ') and len(s) > 7: - sep = s[7] - # find the project directories - i = 0 - while i < len(ss): - s = ss[i] - i += 1 - if s.startswith(' hash: '): - while i < len(ss) and ss[i].startswith(' '): - s = ss[i] - i += 1 - if s.endswith(': ') and i < len(ss) and ss[i].startswith(' depotpath: '): - key = s[4:-2].replace(sep, os.sep) - # parse directory path - j, n, tt = 0, len(key), [] - while j < n: - if key[j] == '"': - # quoted string - j += 1 - while j < n: - if key[j] == '"': - j += 1 - break - elif key[j] == '\\': - # escaped character - j += 1 - if j < n: - tt.append(key[j]) - j += 1 - else: - tt.append(key[j]) - j += 1 - key = ''.join(tt).replace(sep, os.sep) - if utils.isWindows(): - key = key.upper() - projs.append(key) - break - # check if the file belongs to one of the project directories - if FolderSet(projs).contains(name): - return Svk(path) - except IOError: - utils.logError(_('Error parsing %s.') % (svkconfig, )) - -class VCSs: - def __init__(self): - # initialise the VCS objects - self._get_repo = { 'bzr': _get_bzr_repo, 'cvs': _get_cvs_repo, 'darcs': _get_darcs_repo, 'git': _get_git_repo, 'hg': _get_hg_repo, 'mtn': _get_mtn_repo, 'rcs': _get_rcs_repo, 'svk': _get_svk_repo, 'svn': _get_svn_repo } - - def setSearchOrder(self, ordering): - self._search_order = ordering - - # determines which VCS to use for files in the named folder - def findByFolder(self, path, prefs): - path = os.path.abspath(path) - for vcs in prefs.getString('vcs_search_order').split(): - if vcs in self._get_repo: - repo = self._get_repo[vcs](path, prefs) - if repo: - return repo - - # determines which VCS to use for the named file - def findByFilename(self, name, prefs): - if name is not None: - return self.findByFolder(os.path.dirname(name), prefs) - -theVCSs = VCSs() +theVCSs = VcsRegistry() # utility method to step advance an adjustment def step_adjustment(adj, delta): diff --git a/src/utils.py b/src/utils.py index 9428c07..9b8dadd 100644 --- a/src/utils.py +++ b/src/utils.py @@ -104,6 +104,17 @@ def safeRelativePath(abspath1, name, prefs, cygwin_pref): s = s.replace('/', '\\') return s +# returns the Windows drive or share from a from an absolute path +def drive_from_path(s): + c = s.split(os.sep) + if len(c) > 3 and c[0] == '' and c[1] == '': + return os.path.join(c[:4]) + return c[0] + +# escape arguments for use with bash +def bashEscape(s): + return "'" + s.replace("'", "'\\''") + "'" + # use popen to read the output of a command def popenRead(dn, cmd, prefs, bash_pref, success_results=None): if success_results is None: diff --git a/src/vcs/vcs_registry.py b/src/vcs/vcs_registry.py new file mode 100644 index 0000000..ac17175 --- /dev/null +++ b/src/vcs/vcs_registry.py @@ -0,0 +1,216 @@ +# Diffuse: a graphical tool for merging and comparing text files. +# +# Copyright (C) 2019 Derrick Moser +# Copyright (C) 2021 Romain Failliot +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os + +from diffuse import utils +from diffuse.vcs.folder_set import FolderSet +from diffuse.vcs.bzr import Bzr +from diffuse.vcs.cvs import Cvs +from diffuse.vcs.darcs import Darcs +from diffuse.vcs.git import Git +from diffuse.vcs.hg import Hg +from diffuse.vcs.mtn import Mtn +from diffuse.vcs.rcs import Rcs +from diffuse.vcs.svk import Svk +from diffuse.vcs.svn import Svn + +class VcsRegistry: + def __init__(self): + # initialise the VCS objects + self._get_repo = { + 'bzr': _get_bzr_repo, + 'cvs': _get_cvs_repo, + 'darcs': _get_darcs_repo, + 'git': _get_git_repo, + 'hg': _get_hg_repo, + 'mtn': _get_mtn_repo, + 'rcs': _get_rcs_repo, + 'svk': _get_svk_repo, + 'svn': _get_svn_repo + } + + def setSearchOrder(self, ordering): + self._search_order = ordering + + # determines which VCS to use for files in the named folder + def findByFolder(self, path, prefs): + path = os.path.abspath(path) + for vcs in prefs.getString('vcs_search_order').split(): + if vcs in self._get_repo: + repo = self._get_repo[vcs](path, prefs) + if repo: + return repo + + # determines which VCS to use for the named file + def findByFilename(self, name, prefs): + if name is not None: + return self.findByFolder(os.path.dirname(name), prefs) + + +# utility method to help find folders used by version control systems +def _find_parent_dir_with(path, dir_name): + while True: + name = os.path.join(path, dir_name) + if os.path.isdir(name): + return path + newpath = os.path.dirname(path) + if newpath == path: + break + path = newpath + +def _get_bzr_repo(path, prefs): + p = _find_parent_dir_with(path, '.bzr') + if p: + return Bzr(p) + +def _get_cvs_repo(path, prefs): + if os.path.isdir(os.path.join(path, 'CVS')): + return Cvs(path) + +def _get_darcs_repo(path, prefs): + p = _find_parent_dir_with(path, '_darcs') + if p: + return Darcs(p) + +def _get_git_repo(path, prefs): + if 'GIT_DIR' in os.environ: + try: + d = path + ss = utils.popenReadLines(d, [ prefs.getString('git_bin'), 'rev-parse', '--show-prefix' ], prefs, 'git_bash') + if len(ss) > 0: + # be careful to handle trailing slashes + d = d.split(os.sep) + if d[-1] != '': + d.append('') + ss = strip_eol(ss[0]).split('/') + if ss[-1] != '': + ss.append('') + n = len(ss) + if n <= len(d): + del d[-n:] + if len(d) == 0: + d = os.curdir + else: + d = os.sep.join(d) + return Git(d) + except (IOError, OSError, WindowsError): + # working tree not found + pass + # search for .git directory (project) or .git file (submodule) + while True: + name = os.path.join(path, '.git') + if os.path.isdir(name) or os.path.isfile(name): + return Git(path) + newpath = os.path.dirname(path) + if newpath == path: + break + path = newpath + +def _get_hg_repo(path, prefs): + p = _find_parent_dir_with(path, '.hg') + if p: + return Hg(p) + +def _get_mtn_repo(path, prefs): + p = _find_parent_dir_with(path, '_MTN') + if p: + return Mtn(p) + +def _get_rcs_repo(path, prefs): + if os.path.isdir(os.path.join(path, 'RCS')): + return Rcs(path) + + # [rfailliot] this code doesn't seem to work, but was in 0.4.8 too. + # I'm letting it here until further tests are done, but it is possible + # this code never actually worked. + try: + for s in os.listdir(path): + if s.endswith(',v') and os.path.isfile(os.path.join(path, s)): + return Rcs(path) + except OSError: + # the user specified an invalid folder name + pass + +def _get_svn_repo(path, prefs): + p = _find_parent_dir_with(path, '.svn') + if p: + return Svn(p) + +def _get_svk_repo(path, prefs): + name = path + # parse the ~/.svk/config file to discover which directories are part of + # SVK repositories + if utils.isWindows(): + name = name.upper() + svkroot = os.environ.get('SVKROOT', None) + if svkroot is None: + svkroot = os.path.expanduser('~/.svk') + svkconfig = os.path.join(svkroot, 'config') + if os.path.isfile(svkconfig): + try: + # find working copies by parsing the config file + f = open(svkconfig, 'r') + ss = readlines(f) + f.close() + projs, sep = [], os.sep + # find the separator character + for s in ss: + if s.startswith(' sep: ') and len(s) > 7: + sep = s[7] + # find the project directories + i = 0 + while i < len(ss): + s = ss[i] + i += 1 + if s.startswith(' hash: '): + while i < len(ss) and ss[i].startswith(' '): + s = ss[i] + i += 1 + if s.endswith(': ') and i < len(ss) and ss[i].startswith(' depotpath: '): + key = s[4:-2].replace(sep, os.sep) + # parse directory path + j, n, tt = 0, len(key), [] + while j < n: + if key[j] == '"': + # quoted string + j += 1 + while j < n: + if key[j] == '"': + j += 1 + break + elif key[j] == '\\': + # escaped character + j += 1 + if j < n: + tt.append(key[j]) + j += 1 + else: + tt.append(key[j]) + j += 1 + key = ''.join(tt).replace(sep, os.sep) + if utils.isWindows(): + key = key.upper() + projs.append(key) + break + # check if the file belongs to one of the project directories + if FolderSet(projs).contains(name): + return Svk(path) + except IOError: + utils.logError(_('Error parsing %s.') % (svkconfig, )) From 8df27404cddf82e1216f74a4353ab64ebed42bc6 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 18 Nov 2021 14:26:33 -0500 Subject: [PATCH 11/11] Edit CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98cd38a..830ac50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 message ### Changed +- Modularized the VCSs (reducing main.py by around 1300 lines) ### Fixed - Fixed 'APP_NAME' error when opening non existing file