4754: rbt diff output raw string

totoroliu
david
david

What version are you running?

Ubuntu 18.04.1
RBTools 1.0.1
svn, version 1.9.7 (r1800392)
Python 3.6.6

What steps will reproduce the problem?

  1. SVN commit a text file with content:
$ cat Test/test1
line1
line2
line3
line4
line5

  1. Replace line3 with "new line3"

  2. svn diff output:

Index: Test/test1
===================================================================
--- Test/test1  (revision 26385)
+++ Test/test1  (working copy)
@@ -1,5 +1,5 @@
 line1
 line2
-line3
+new line3
 line4
 line5

  1. rbt diff output:
$ rbt diff
b'Index: /TestProject/trunk/Test/test1\n===================================================================\n--- /TestProject/trunk/Test/test1\t(revision 26385)\n+++ /TestProject/trunk/Test/test1\t(working copy)\n@@ -1,5 +1,5 @@\n line1\n line2\n-line3\n+new line3\n line4\n line5\n

What is the expected output? What do you see instead?

Ubuntu 16.04.5
RBTools 1.0.1
svn, version 1.9.9 (r1835931)
Python 2.7.14

$ svn diff
Index: Test/test1
===================================================================
--- Test/test1  (revision 26385)
+++ Test/test1  (working copy)
@@ -1,5 +1,5 @@
 line1
 line2
-line3
+new line3
 line4
 line5

$ rbt diff
Index: /TestProject/trunk/Test/test1
===================================================================
--- /TestProject/trunk/Test/test1   (revision 26385)
+++ /TestProject/trunk/Test/test1   (working copy)
@@ -1,5 +1,5 @@
 line1
 line2
-line3
+new line3
 line4
 line5

What operating system are you using?

Ubuntu 18.04.1

Attach the debug out from the command.

$ rbt diff --debug
>>> RBTools 1.0.1
>>> Python 3.6.6 (default, Sep 12 2018, 18:26:19) 
[GCC 8.0.1 20180414 (experimental) [trunk revision 259383]]
>>> Running on Linux-4.15.0-36-generic-x86_64-with-Ubuntu-18.04-bionic
>>> Home = /home/devops
>>> Current directory = /home/devops/TestProject_trunk
>>> Command line: rbt diff --debug
>>> Running: tf vc help
>>> Checking for a Bazaar repository...
>>> Unable to execute "bzr help": skipping Bazaar
>>> Checking for a ClearCase repository...
>>> Unable to execute "cleartool help": skipping ClearCase
>>> Checking for a CVS repository...
>>> Unable to execute "cvs": skipping CVS
>>> Checking for a Git repository...
>>> Running: git rev-parse --git-dir
>>> Command exited with rc 128: ['git', 'rev-parse', '--git-dir']
fatal: not a git repository (or any of the parent directories): .git
---
>>> Checking for a Mercurial repository...
>>> Unable to execute "hg --help": skipping Mercurial
>>> Checking for a Perforce repository...
>>> Unable to execute "p4 help": skipping Perforce
>>> Checking for a Plastic repository...
>>> Unable to execute "cm version": skipping Plastic
>>> Checking for a Subversion repository...
>>> Running: svn --non-interactive info
>>> Running: diff --version
>>> Running: svn --non-interactive --version -q
>>> Repository info: Path: https://scm-yvr-mirror.fortinet.com/svn/svntest, Base path: /TestProject/trunk, Supports changesets: False
>>> Checking for a Team Foundation Server repository...
>>> Unable to execute "tf help": skipping TFS
>>> Making HTTP GET request to https://reviewboard-test.corp.fortinet.com/api/
>>> Running: svn --non-interactive status -q --ignore-externals
>>> Running: svn --non-interactive diff --diff-cmd=diff --notice-ancestry -r BASE
>>> Running: svn --non-interactive info Test/test1
>>> Running: svn --non-interactive info Test
>>> Running: svn --non-interactive diff --diff-cmd=diff --notice-ancestry -r BASE --no-diff-deleted
b'Index: /TestProject/trunk/Test/test1\n===================================================================\n--- /TestProject/trunk/Test/test1\t(revision 26385)\n+++ /TestProject/trunk/Test/test1\t(working copy)\n@@ -1,5 +1,5 @@\n line1\n line2\n-line3\n+new line3\n line4\n line5\n'

Please provide any additional information below.

#1 rfs613

Please see comment 2 on ticket 4736
https://hellosplat.com/s/beanbag/tickets/4736/#c2

david
#2 david
  • - rbt diff output raw string
    +rbt diff output raw string
  • +david
david
#3 david

Fixed in release-1.0.x (a9305e7). This will ship in 1.0.2. Thanks!

  • -New
    +Fixed