Hi all!

Jérémy Bobbio:
> Satyam Zode:
>> So this summer I intend to work on
>> 1) Improvements to diffoscope:
>> 1.1)  Allow users to ignore arbitrary differences (Addition of
>> ignore-profiles flag).
>> 1.2)  Perform fuzzy-matching across archives.
>> 1.3)  Finish parallel processing part.
>> Above points are mentioned on GSoC wiki. And also there are more
>> features mentioned in whishlist
>> (https://reproducible-builds.org/events/athens2015/diffoscope-wishlist/)
>> I will try to cover some of those too.
>
> Sounds good. Be aware that the first part will require some design work.
> Finding the right UI regarding ignores might require input from the
> community. I'd recommend to split this into two parts
> (design+experiment+survey / implementation+documentation). You probably
> will want to work on other things in parellel with the discussions.
>
I have started thinking on design will soon let you all know. It'd be
great if you show me some directions towards designing the proposed
features.
(I will create new thread for this).
> Could you try to come up with rough estimations on how much time all of
> the above would require?
>
Yes! But first, I need some time for that (maybe upcoming 24 hours)
because I want to think more about features proposed above(I don't
know how much complex those features could be!).

Moving to the interesting part :)
> Fixing #818856 should not be too hard. If you could submit a patch that
> would make more confident that you could do all the above.
>
Thank you so much for giving me this task :-) . Now I know how
diffoscope can be tested and build from code. (Before this I was only
familiar with codebase and diffoscope functionalities )

I have fixed this issue. I also have fixed link in the documentation.
Please find an attachment.
Here is the output which I have got:

satyam@satyamz:~/Debian/experiment/diffoscope/bin$ mkdir foo bar
satyam@satyamz:~/Debian/experiment/diffoscope/bin$ touch foo/baz
satyam@satyamz:~/Debian/experiment/diffoscope/bin$ ln -s somefile bar/baz
satyam@satyamz:~/Debian/experiment/diffoscope/bin$ ./diffoscope foo bar
--- foo
+++ bar
├── stat {}
│ @@ -1,8 +1,8 @@
│
│    Size: 4096       Blocks: 8          IO Block: 4096   directory
│       Links: 2
│  Access: (0755/drwxr-xr-x)  Uid: ( 1000/  satyam)   Gid: ( 1000/  satyam)
│
│ -Modify: 2016-03-21 17:22:54.004395232 +0000
│ +Modify: 2016-03-21 17:23:20.516394537 +0000
│
│   Birth: -
│   --- foo/baz
├── +++ bar/baz
│ @@ -0,0 +1,2 @@
│ +0000000: 6465 7374 696e 6174 696f 6e3a 2073 6f6d  destination: som
│ +0000010: 6566 696c 650a                           efile.
│   ├── stat {}
│   │ @@ -1,8 +1,8 @@
│   │
│   │ -  Size: 0         Blocks: 0          IO Block: 4096   regular empty file
│   │ +  Size: 8         Blocks: 0          IO Block: 4096   symbolic link
│   │       Links: 1
│   │ -Access: (0644/-rw-r--r--)  Uid: ( 1000/  satyam)   Gid: ( 1000/  satyam)
│   │ +Access: (0777/lrwxrwxrwx)  Uid: ( 1000/  satyam)   Gid: ( 1000/  satyam)
│   │
│   │ -Modify: 2016-03-21 17:22:54.004395232 +0000
│   │ +Modify: 2016-03-21 17:23:20.516394537 +0000
│   │
│   │   Birth: -
│   ╵
╵
satyam@satyamz:~/Debian/experiment/diffoscope/bin$



> Most of the improvements we could think of have indeed been implemented
> since. :)
Nice :)
I also want to know, whether I will be able to edit application or not
after a deadline?


Thanks again!
Satyam Zode
From 3e9aea18767099dffe62c14e7215aed54347a10f Mon Sep 17 00:00:00 2001
From: Satyam Zode <satyamz...@gmail.com>
Date: Mon, 21 Mar 2016 23:12:55 +0530
Subject: [PATCH 1/2] fixed issue related to diffoscope symlinks crashing

---
 diffoscope/comparators/binary.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diffoscope/comparators/binary.py b/diffoscope/comparators/binary.py
index 9663214..5622a9c 100644
--- a/diffoscope/comparators/binary.py
+++ b/diffoscope/comparators/binary.py
@@ -183,7 +183,7 @@ class File(object, metaclass=ABCMeta):
         logger.debug('%s has_same_content %s', self, other)
         # try comparing small files directly first
         my_size = os.path.getsize(self.path)
-        other_size = os.path.getsize(other.path)
+        other_size = os.lstat(other.path).st_size
         if my_size == other_size and my_size <= SMALL_FILE_THRESHOLD:
             if open(self.path, 'rb').read() == open(other.path, 'rb').read():
                 return True
-- 
2.1.4

From 79809c35a402f1e28f1c3f7c94985274172c0415 Mon Sep 17 00:00:00 2001
From: Satyam Zode <satyamz...@gmail.com>
Date: Mon, 21 Mar 2016 23:25:27 +0530
Subject: [PATCH 2/2] Fixed link in documentation

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index fe23a37..5288e52 100644
--- a/README.rst
+++ b/README.rst
@@ -83,7 +83,7 @@ system against the diffoscope package:
 Join the users and developers mailing-list:
 <https://lists.reproducible-builds.org/listinfo/diffoscope>
 
-diffoscope website is at <https://diffosocope.org/>
+diffoscope website is at <https://diffoscope.org/>
 
 License
 -------
-- 
2.1.4

_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Reply via email to