Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47 from MightyCreak/fix-rcs-diff 

Fix bug with RCS VCS
This commit is contained in:
Creak 2020-06-22 19:36:26 -04:00 committed by GitHub
parent e76790a3da c5b0dc19a0
commit 975bab89f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/usr/bin/diffuse
View File

@ -2263,11 +2263,11 @@ class _Rcs:
if len(r): if len(r):
prev = '.'.join(r) prev = '.'.join(r)
for k in sorted(names): for k in sorted(names):
if prev is None: if prev is None:
k0 = None k0 = None
else: else:
k0 = k k0 = k
result.append([ (k0, prev), (k, rev) ]) result.append([ (k0, prev), (k, rev) ])
except ValueError: except ValueError:
logError(_('Error parsing revision %s.') % (rev, )) logError(_('Error parsing revision %s.') % (rev, ))
return result return result
@ -2337,6 +2337,12 @@ class _Rcs:
return popenRead(self.root, [ prefs.getString('rcs_bin_co'), '-p', '-q', '-r' + rev, safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ], prefs, 'rcs_bash') return 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): 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: try:
for s in os.listdir(path): for s in os.listdir(path):
if s.endswith(',v') and os.path.isfile(os.path.join(path, s)): if s.endswith(',v') and os.path.isfile(os.path.join(path, s)):