diffuse-users Mailing List for Diffuse
Status: Beta
Brought to you by:
dtmoser
You can subscribe to this list here.
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
(1) |
Feb
|
Mar
(2) |
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
From: Mike H. <mah...@gm...> - 2019-09-27 06:34:07
|
The sourceforge subversion repo for Diffuse seems not to be working. Has it moved? Thanks Mike |
From: Jim B. <jim...@gm...> - 2016-09-26 14:48:37
|
To whom would I address a request for a feature addition? Many times, I'm comparing files in the same path on different servers and I would use diffuse a lot more if I could click on the "address bar", the line which shows the full server\path\file, and be able to copy it into the clipboard, for pasting in one or more other "file open" windows. With it's current capabilities, I mostly use it for comparisons of more than 3 files, because there are a couple other comparison apps which are easier to paste paths into. Until then beyond compare and kdiff offer faster 2 & 3 file compare input. Thanks, Jim |
From: Tony de G. <Tde...@im...> - 2016-05-10 02:07:20
|
Hi Derrick, Thanks for the quick reply. I have tried moving the panes around, and while it is better, the comparison of the differences on the far right still highlights all the panes, so it is less useful than I would hope for. At this stage the only way I have found that is useful is to open all the files I think may be relevant. Look at the various files to see which ones I think look the most useful, then close the tab and re-open another tab with only the files of interest. For this it is very useful that the file-open remembers where the last file was opened from so it is usually only a couple of mouse clicks to get each file to compare. Apart from the behaviour of not being able to add/remove from a tab, the program is very useful. Thank you for making it available. Thanks, Tony de Groot Principal Engineer D: +61 8 9270 8050 E: Tde...@Im... www.ImmersiveTechnologies.com<http://www.immersivetechnologies.com/> From: Derrick Moser [mailto:der...@ya...] Sent: Monday, 9 May 2016 11:39 PM To: Tony de Groot; dif...@li... Subject: Re: [Diffuse-users] Newbie question - how to remove a pane from a tab Tony, Panes cannot be added or removed from a tab. This is something I wish to change in a future release but significant redesign is needed to implement it. As a work-around, you could identify the set of files you wish to compare and open a new tab with just those files. Another work-around is to move the panes you wish to discard all the way to the left or the right (see the "View->Shift Pane Right" and "View->Shift Pane Left" menu items). Cheers, Derrick ________________________________ From: Tony de Groot <Tde...@im...<mailto:Tde...@im...>> To: "dif...@li...<mailto:dif...@li...>" <dif...@li...<mailto:dif...@li...>> Sent: Sunday, 8 May 2016, 22:01 Subject: [Diffuse-users] Newbie question - how to remove a pane from a tab Hi, I am new to Diffuse, and cannot find out how to remove a selected file from those listed in a tab. I am trying to look at the history of some old code, which gives me 7 files to compare. I open them all up in the one tab and have a look at them. When I find one file that is too old, I want to close it and continue the comparison between the remainder. Rinse and repeat until I have maybe one or 2 relevant files to use. Can someone tell me how to close the unwanted files as I go? Thanks, Tony de Groot Principal Engineer D: +61 8 9270 8050 E: Tde...@Im...<mailto:Tde...@Im...> [cid:image001.gif@01D1AAA3.B2E1D1F0]<http://www.immersivetechnologies.com/> YouTube<http://www.youtube.com/channel/UCFB0-tgoMdZBUdI9n0-ztSQ?sub_confirmation=1> | LinkedIn<http://www.linkedin.com/company/immersive-technologies?trk=fc_badge> | Google+<http://plus.google.com/106523448781407207880> ________________________________ Disclaimer: This message contains confidential information and is intended only for the individual(s) named. If you are not the named addressee you should not disseminate, distribute or copy this email. Please immediately delete it and all copies of it from your system, destroy any hard copies of it, and notify the sender. Email transmission cannot be guaranteed to be secure or error-free as information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses. To the maximum extent permitted by law, Immersive Technologies Pty. Ltd. does not accept liability for any errors or omissions in the contents of this message which arise as a result of email transmission. ------------------------------------------------------------------------------ Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z _______________________________________________ Diffuse-users mailing list Dif...@li...<mailto:Dif...@li...> https://lists.sourceforge.net/lists/listinfo/diffuse-users |
From: Derrick M. <der...@ya...> - 2016-05-09 15:39:21
|
Tony, Panes cannot be added or removed from a tab. This is something I wish to change in a future release but significant redesign is needed to implement it. As a work-around, you could identify the set of files you wish to compare and open a new tab with just those files. Another work-around is to move the panes you wish to discard all the way to the left or the right (see the "View->Shift Pane Right" and "View->Shift Pane Left" menu items). Cheers,Derrick From: Tony de Groot <Tde...@im...> To: "dif...@li..." <dif...@li...> Sent: Sunday, 8 May 2016, 22:01 Subject: [Diffuse-users] Newbie question - how to remove a pane from a tab <!--#yiv7521030187 _filtered #yiv7521030187 {font-family:Calibri;panose-1:2 15 5 2 2 2 4 3 2 4;} _filtered #yiv7521030187 {font-family:Tahoma;panose-1:2 11 6 4 3 5 4 4 2 4;}#yiv7521030187 #yiv7521030187 p.yiv7521030187MsoNormal, #yiv7521030187 li.yiv7521030187MsoNormal, #yiv7521030187 div.yiv7521030187MsoNormal {margin:0cm;margin-bottom:.0001pt;font-size:11.0pt;font-family:"Calibri", "sans-serif";}#yiv7521030187 a:link, #yiv7521030187 span.yiv7521030187MsoHyperlink {color:blue;text-decoration:underline;}#yiv7521030187 a:visited, #yiv7521030187 span.yiv7521030187MsoHyperlinkFollowed {color:purple;text-decoration:underline;}#yiv7521030187 p.yiv7521030187MsoAcetate, #yiv7521030187 li.yiv7521030187MsoAcetate, #yiv7521030187 div.yiv7521030187MsoAcetate {margin:0cm;margin-bottom:.0001pt;font-size:8.0pt;font-family:"Tahoma", "sans-serif";}#yiv7521030187 span.yiv7521030187EmailStyle17 {font-family:"Calibri", "sans-serif";color:windowtext;}#yiv7521030187 span.yiv7521030187BalloonTextChar {font-family:"Tahoma", "sans-serif";}#yiv7521030187 .yiv7521030187MsoChpDefault {font-family:"Calibri", "sans-serif";} _filtered #yiv7521030187 {margin:72.0pt 72.0pt 72.0pt 72.0pt;}#yiv7521030187 div.yiv7521030187WordSection1 {}-->Hi, I am new to Diffuse, and cannot find out how to remove a selected file from those listed in a tab. I am trying to look at the history of some old code, which gives me 7 files to compare. I open them all up in the one tab and have a look at them. When I find one file that is too old, I want to close it and continue the comparison between the remainder. Rinse and repeat until I have maybe one or 2 relevant files to use. Can someone tell me how to close the unwanted files as I go? Thanks, Tony de Groot Principal Engineer D:+61 8 9270 8050 E:Tde...@Im... YouTube | LinkedIn | Google+ Disclaimer: This message contains confidential information and is intended only for the individual(s) named. If you are not the named addressee you should not disseminate, distribute or copy this email. Please immediately delete it and all copies of it from your system, destroy any hard copies of it, and notify the sender. Email transmission cannot be guaranteed to be secure or error-free as information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses. To the maximum extent permitted by law, Immersive Technologies Pty. Ltd. does not accept liability for any errors or omissions in the contents of this message which arise as a result of email transmission. ------------------------------------------------------------------------------ Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z _______________________________________________ Diffuse-users mailing list Dif...@li... https://lists.sourceforge.net/lists/listinfo/diffuse-users |
From: Tony de G. <Tde...@im...> - 2016-05-09 02:22:01
|
Hi, I am new to Diffuse, and cannot find out how to remove a selected file from those listed in a tab. I am trying to look at the history of some old code, which gives me 7 files to compare. I open them all up in the one tab and have a look at them. When I find one file that is too old, I want to close it and continue the comparison between the remainder. Rinse and repeat until I have maybe one or 2 relevant files to use. Can someone tell me how to close the unwanted files as I go? Thanks, Tony de Groot Principal Engineer D: +61 8 9270 8050 E: Tde...@Im... [cid:image001.gif@01D1A9D9.C7C6D8B0]<http://www.immersivetechnologies.com/> YouTube<http://www.youtube.com/channel/UCFB0-tgoMdZBUdI9n0-ztSQ?sub_confirmation=1> | LinkedIn<http://www.linkedin.com/company/immersive-technologies?trk=fc_badge> | Google+<http://plus.google.com/106523448781407207880> ________________________________ Disclaimer: This message contains confidential information and is intended only for the individual(s) named. If you are not the named addressee you should not disseminate, distribute or copy this email. Please immediately delete it and all copies of it from your system, destroy any hard copies of it, and notify the sender. Email transmission cannot be guaranteed to be secure or error-free as information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses. To the maximum extent permitted by law, Immersive Technologies Pty. Ltd. does not accept liability for any errors or omissions in the contents of this message which arise as a result of email transmission. |
From: Ben S. <bxs...@ya...> - 2016-03-17 07:22:41
|
Hello Derrick, thank you for reply. Yes, the "syntax" folder exists with *.syntax files in it. I am using Windows 7 64bit. and yes, the menu View->Syntax Highlighting is empty. BUT: Am I really forced to have syntax highlighting enabled? What, if I just want to temporarily compare e.g.two logfiles and no programming code? Meanwhile I tracked down the reason for error: The path is not like the simplified one written in the original post: H:\tools\DiffUse\diffuserc but it contains here in reality brackets like H:\tools\DiffUse [v0.4.8]\diffuserc If I omit the brackets it works here without error popup. However I use an indicator for the version in all my software. And all other software works with brackets in path - except DiffUse. So I guess its a bug in DiffUse. Could you fix the error in the next release? Thank you Ben --Original Message Text--- From: Derrick Moser Date: Sun, 6 Mar 2016 17:05:04 +0000 (UTC) Ben, The error message indicates Diffuse could not load the syntax resource files. I am not very familiar with Microsoft Windows and was not able to reproduce the problem so you might need to do a little investigating. When Diffuse was installed, it should have created a directory called "syntax" in the same folder as the diffuserc file. Does this folder exist? Does it contain a bunch of *.syntax files? My guess is a file permissions problem is preventing the process from reading the syntax files (or inspecting the contents of the syntax folder). The syntax files basically describe syntax highlighting rules. If Diffuse fails to read these, I would expect there to be no entries in the "View -> Syntax Highlighting" menu and no text will have syntax highlighting. I would expect the rest of the application to still function correctly. Deleting the diffuserc file will avoid the error message but will also remove syntax highlighting support. I would first check that the "syntax" folder exists and the files inside it can be read by the user. Which version of Microsoft Windows did you encounter this problem with? Cheers, Derrick From: Ben Stover <bxs...@ya...> To: DiffUse Users <dif...@li...> Sent: Sunday, 6 March 2016, 1:41 Subject: [Diffuse-users] DiffUse: Error processing line 5 of H:\tools\DiffUse\fiffuserc I installed DiffUse on an external USB flash drive, When I call it by double clicking diffusew.exe then an error popup appears with the error msg shown in subject line. Why? How can I avoid it? Can I simply delete diffuserc? The content of diffuserc is: --------------------------------------------- # initialisation file for diffuse # Copyright (C) 2006-2009 Derrick Moser <der...@ya...> import syntax/*.syntax ---------------------------------------------- After clicking on OK button in error popup the main window appears "as normal" Ben ------------------------------------------------------------------------------ _______________________________________________ Diffuse-users mailing list Dif...@li... https://lists.sourceforge.net/lists/listinfo/diffuse-users |
From: Ben S. <bxs...@ya...> - 2016-03-06 06:41:22
|
I installed DiffUse on an external USB flash drive, When I call it by double clicking diffusew.exe then an error popup appears with the error msg shown in subject line. Why? How can I avoid it? Can I simply delete diffuserc? The content of diffuserc is: --------------------------------------------- # initialisation file for diffuse # Copyright (C) 2006-2009 Derrick Moser <der...@ya...> import syntax/*.syntax ---------------------------------------------- After clicking on OK button in error popup the main window appears "as normal" Ben |
From: Håkon H. <ha...@ya...> - 2016-01-12 09:38:21
|
Hi, Seems like diffuse may support showing all differences between two revisions: diffuse -r A -r B or all differences between a revision and working directory: diffuse -r A But all I get is the Diffuse window with no tabs. If it's not supported, would it be difficult to add? Thanks,Håkon Hallingstad |
From: Derrick M. <der...@ya...> - 2014-08-07 15:10:40
|
Nick, The "#!/usr/bin/env python" bit was intended to help make Diffuse a bit more portable as Python is normally located at /usr/local/bin/python on some platforms. This should not be needed any more as the install.py script will update the path as needed during installation or building a package. It should be safe^{TM} to change it. Cheers, Derrick ________________________________ From: Nick Timkovich <pro...@gm...> To: dif...@li... Sent: Monday, 4 August 2014, 20:44 Subject: [Diffuse-users] Using system Python A common stumbling block that I hit when using Diffuse and Python virtualenvs is that because the shebang of Diffuse is "#!/usr/bin/env python", it grabs my virtualenv, which inevitably doesn't have PyGTK installed then crashes. I've had to explain to another couple users that, "yeah, you need to execute it from outside your virtual environment". By way of comparison, hg always uses the system Python ("#! /usr/bin/python"). I class Diffuse with Mercurial, machine-specific programs that should use local system resources, not something that should ever change based on the context or environment in which I run it. Can this be altered or is there a deeper purpose to using the environment's Python? I'd submit a patch but it'd be a bit of a joke; deleting 4 characters ;) Cheers, Nick ------------------------------------------------------------------------------ Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk _______________________________________________ Diffuse-users mailing list Dif...@li... https://lists.sourceforge.net/lists/listinfo/diffuse-users |
From: Nick T. <pro...@gm...> - 2014-08-05 00:44:43
|
A common stumbling block that I hit when using Diffuse and Python virtualenvs is that because the shebang of Diffuse is "#!/usr/bin/env python", it grabs my virtualenv, which inevitably doesn't have PyGTK installed then crashes. I've had to explain to another couple users that, "yeah, you need to execute it from outside your virtual environment". By way of comparison, hg always uses the system Python ("#! /usr/bin/python"). I class Diffuse with Mercurial, machine-specific programs that should use local system resources, not something that should ever change based on the context or environment in which I run it. Can this be altered or is there a deeper purpose to using the environment's Python? I'd submit a patch but it'd be a bit of a joke; deleting 4 characters ;) Cheers, Nick |
From: Eizan M. <eiz...@gm...> - 2014-05-13 17:32:47
|
Hi Derrick, It seems like that fixes it. Thanks for the quick reply :) FWIW, $ python Python 2.7.3 (default, Mar 14 2014, 11:57:14) [GCC 4.7.2] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> import gtk >>> gtk.pygtk_version (2, 24, 0) Eizan On Tue, May 13, 2014 at 6:22 PM, Derrick Moser <der...@ya...>wrote: > Eizan, > > The preference value should never be None. I suspect the version of PyGTK > on your system is returning None instead of a blank string from text > widgets. Does the following patch fix the problem? > > Cheers, > Derrick > > --- diffuse (revision 409) > +++ diffuse (working copy) > @@ -991,7 +991,7 @@ > for k in self.int_prefs.keys(): > self.int_prefs[k] = widgets[k].get_value_as_int() > for k in self.string_prefs.keys(): > - self.string_prefs[k] = widgets[k].get_text() > + self.string_prefs[k] = nullToEmpty(widgets[k].get_text()) > > try: > ss = [] > for k, v in self.bool_prefs.items(): > > ------------------------------ > *From:* Eizan Miyamoto <eiz...@gm...> > *To:* dif...@li... > *Sent:* Tuesday, 13 May 2014, 13:04 > *Subject:* [Diffuse-users] Preferences update error? > > Hi everyone, > > I've recently come across a possible(?) bug in the most recent Diffuse > release (0.4.7). Basically, when I try to update a particular preference > item, the change won't take and I get some errors spit out to my console. I > don't see anything related to this on the bug tracker. > > More specifically, when I tick Preferences->Display->ignore end of line > differences, the following error is emitted: > > Traceback (most recent call last): > File "/usr/bin/diffuse", line 8098, in preferences_cb > if self.prefs.runDialog(self.get_toplevel()): > File "/usr/bin/diffuse", line 1003, in runDialog > ss.append('%s "%s"\n' % (k, v.replace('\\', '\\\\').replace('"', > '\\"'))) > AttributeError: 'NoneType' object has no attribute 'replace' > > When I apply the following patch, the issue goes away, but it's a pretty > messy hack: > > @@ -995,13 +995,13 @@ class Preferences: > try: > ss = [] > for k, v in self.bool_prefs.items(): > - if v != self.default_bool_prefs[k]: > + if v is not None and v != self.default_bool_prefs[k]: > ss.append('%s %s\n' % (k, v)) > for k, v in self.int_prefs.items(): > - if v != self.default_int_prefs[k]: > + if v is not None and v != self.default_int_prefs[k]: > ss.append('%s %s\n' % (k, v)) > for k, v in self.string_prefs.items(): > - if v != self.default_string_prefs[k]: > + if v is not None and v != > self.default_string_prefs[k]: > ss.append('%s "%s"\n' % (k, v.replace('\\', > '\\\\').replace('"', '\\"'))) > ss.sort() > f = open(self.path, 'w') > > Or, do I perhaps have Diffuse installed incorrectly? I installed it with: > $ install.py --prefix=$HOME/opt --destdir=$HOME/opt > > note: > > $ uname -a > Linux debian 3.2.0-4-486 #1 Debian 3.2.54-2 i686 GNU/Linux > $ python --version > Python 2.7.3 > > Thanks! > > Eizan > > > ------------------------------------------------------------------------------ > "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE > Instantly run your Selenium tests across 300+ browser/OS combos. > Get unparalleled scalability from the best Selenium testing platform > available > Simple to use. Nothing to install. Get started now for free." > http://p.sf.net/sfu/SauceLabs > _______________________________________________ > Diffuse-users mailing list > Dif...@li... > https://lists.sourceforge.net/lists/listinfo/diffuse-users > > > |
From: Derrick M. <der...@ya...> - 2014-05-13 17:22:14
|
Eizan, The preference value should never be None. I suspect the version of PyGTK on your system is returning None instead of a blank string from text widgets. Does the following patch fix the problem? Cheers, Derrick --- diffuse (revision 409) +++ diffuse (working copy) @@ -991,7 +991,7 @@ for k in self.int_prefs.keys(): self.int_prefs[k] = widgets[k].get_value_as_int() for k in self.string_prefs.keys(): - self.string_prefs[k] = widgets[k].get_text() + self.string_prefs[k] = nullToEmpty(widgets[k].get_text()) try: ss = [] for k, v in self.bool_prefs.items(): ________________________________ From: Eizan Miyamoto <eiz...@gm...> To: dif...@li... Sent: Tuesday, 13 May 2014, 13:04 Subject: [Diffuse-users] Preferences update error? Hi everyone, I've recently come across a possible(?) bug in the most recent Diffuse release (0.4.7). Basically, when I try to update a particular preference item, the change won't take and I get some errors spit out to my console. I don't see anything related to this on the bug tracker. More specifically, when I tick Preferences->Display->ignore end of line differences, the following error is emitted: Traceback (most recent call last): File "/usr/bin/diffuse", line 8098, in preferences_cb if self.prefs.runDialog(self.get_toplevel()): File "/usr/bin/diffuse", line 1003, in runDialog ss.append('%s "%s"\n' % (k, v.replace('\\', '\\\\').replace('"', '\\"'))) AttributeError: 'NoneType' object has no attribute 'replace' When I apply the following patch, the issue goes away, but it's a pretty messy hack: @@ -995,13 +995,13 @@ class Preferences: try: ss = [] for k, v in self.bool_prefs.items(): - if v != self.default_bool_prefs[k]: + if v is not None and v != self.default_bool_prefs[k]: ss.append('%s %s\n' % (k, v)) for k, v in self.int_prefs.items(): - if v != self.default_int_prefs[k]: + if v is not None and v != self.default_int_prefs[k]: ss.append('%s %s\n' % (k, v)) for k, v in self.string_prefs.items(): - if v != self.default_string_prefs[k]: + if v is not None and v != self.default_string_prefs[k]: ss.append('%s "%s"\n' % (k, v.replace('\\', '\\\\').replace('"', '\\"'))) ss.sort() f = open(self.path, 'w') Or, do I perhaps have Diffuse installed incorrectly? I installed it with: $ install.py --prefix=$HOME/opt --destdir=$HOME/opt note: $ uname -a Linux debian 3.2.0-4-486 #1 Debian 3.2.54-2 i686 GNU/Linux $ python --version Python 2.7.3 Thanks! Eizan ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ Diffuse-users mailing list Dif...@li... https://lists.sourceforge.net/lists/listinfo/diffuse-users |
From: Eizan M. <eiz...@gm...> - 2014-05-13 17:04:49
|
Hi everyone, I've recently come across a possible(?) bug in the most recent Diffuse release (0.4.7). Basically, when I try to update a particular preference item, the change won't take and I get some errors spit out to my console. I don't see anything related to this on the bug tracker. More specifically, when I tick Preferences->Display->ignore end of line differences, the following error is emitted: Traceback (most recent call last): File "/usr/bin/diffuse", line 8098, in preferences_cb if self.prefs.runDialog(self.get_toplevel()): File "/usr/bin/diffuse", line 1003, in runDialog ss.append('%s "%s"\n' % (k, v.replace('\\', '\\\\').replace('"', '\\"'))) AttributeError: 'NoneType' object has no attribute 'replace' When I apply the following patch, the issue goes away, but it's a pretty messy hack: @@ -995,13 +995,13 @@ class Preferences: try: ss = [] for k, v in self.bool_prefs.items(): - if v != self.default_bool_prefs[k]: + if v is not None and v != self.default_bool_prefs[k]: ss.append('%s %s\n' % (k, v)) for k, v in self.int_prefs.items(): - if v != self.default_int_prefs[k]: + if v is not None and v != self.default_int_prefs[k]: ss.append('%s %s\n' % (k, v)) for k, v in self.string_prefs.items(): - if v != self.default_string_prefs[k]: + if v is not None and v != self.default_string_prefs[k]: ss.append('%s "%s"\n' % (k, v.replace('\\', '\\\\').replace('"', '\\"'))) ss.sort() f = open(self.path, 'w') Or, do I perhaps have Diffuse installed incorrectly? I installed it with: $ install.py --prefix=$HOME/opt --destdir=$HOME/opt note: $ uname -a Linux debian 3.2.0-4-486 #1 Debian 3.2.54-2 i686 GNU/Linux $ python --version Python 2.7.3 Thanks! Eizan |
From: Dimitris K. <dka...@ai...> - 2013-11-18 23:55:58
|
Hi everyone, What a great tool Diffuse is. I have a question though on how can I save an N-Way file merge view? e.g. I have specified a 10-Way file merge, opened all files one by one and I want to use that comparison view say 2 days later. Thank you in advance, Dimitris |
From: Derrick M. <der...@ya...> - 2013-07-15 14:58:13
|
Alexander, You should be able to create a quick and dirty text based N file comparison from Diffuse's source without much difficulty. I can help point you in the right direction if this is what you want to accomplish. The inner format used by Diffuse is basically an array of strings for each file representing its lines of text with spacers inserted for alignment. A separate array of blocks is used to describe manual alignments. Cheers, Derrick ________________________________ From: Alexander Myltsev <ale...@ph...> To: "dif...@li..." <dif...@li...> Sent: Monday, 15 July 2013, 10:19 Subject: Re: [Diffuse-users] diffues output to file Derrick, This is sad :( For my purposes I need `diffuse` to be called from terminal/console with bunch of options. GUI is secondly. I thought you are calling some function under the hood that produces diff for N files in some inner format. Then that `diff for N files` is passed to GUI. So, the task now is to program pretty printer to produce text to std-out. If it is tightly coupled then there is a problem... A. |
From: Alexander M. <ale...@ph...> - 2013-07-15 14:19:23
|
Derrick, This is sad :( For my purposes I need `diffuse` to be called from terminal/console with bunch of options. GUI is secondly. I thought you are calling some function under the hood that produces diff for N files in some inner format. Then that `diff for N files` is passed to GUI. So, the task now is to program pretty printer to produce text to std-out. If it is tightly coupled then there is a problem... A. On 15 July 2013 18:10, Derrick Moser <der...@ya...> wrote: > Alexander, > > > I wonder how to save `diffuse file1 file2 file3` result to output file > like `diff` do it? > > Unfortunately, Diffuse currently does not have an option to output a patch > file. I have only started looking at workflows for using patch files. > Generating patch files should not be difficult. I imagine a simple dialog > allowing the user to pick the tabs to include in the patch and a way to > pick the root path. Is this how you envisioned exporting the comparison > results? Reading and manipulating patch files in a convenient way is a > bigger challenge. > > Cheers, > Derrick > |
From: Derrick M. <der...@ya...> - 2013-07-15 14:10:20
|
Alexander, > I wonder how to save `diffuse file1 file2 file3` result to output file like `diff` do it? Unfortunately, Diffuse currently does not have an option to output a patch file. I have only started looking at workflows for using patch files. Generating patch files should not be difficult. I imagine a simple dialog allowing the user to pick the tabs to include in the patch and a way to pick the root path. Is this how you envisioned exporting the comparison results? Reading and manipulating patch files in a convenient way is a bigger challenge. Cheers, Derrick |
From: Alexander M. <ale...@ph...> - 2013-07-14 11:28:29
|
Dear authors, thank you for diffuse tool. I wonder how to save `diffuse file1 file2 file3` result to output file like `diff` do it? A. |
From: Derrick M. <der...@ya...> - 2009-08-17 11:25:03
|
Hello everyone, I created this list so users of Diffuse can ask questions or have discussions with others in the Diffuse community. Cheers, Derrick New Email addresses available on Yahoo! Get the Email name you've always wanted on the new @ymail and @rocketmail. Hurry before someone else does! http://mail.promotions.yahoo.com/newdomains/aa/ |