> This would mean that even if the VCS isn't configured for (or does= n't
> support) diff3 output, we still have a way of showing the BASE.

Right, but... we can do this now. It's just about whether we want= to
trust the VC's merge, or our merge. I personally would prefer to trust<= br> the VC's, even at the cost of not being able to show BASE.

I'm willing to be persuaded out of this position, but it might be
difficult. In fact, it would probably be easier to just convince
various VCs to give us diff3s. :)

Do you have a way to= convince git/svn to give us diff3s besides editing config? (I coudn't = find a way from command line only)

it's possible with bzr (bz= r remerge --show-base)=A0

>> Fair enough. BTW, it would be awesome to see a way to run thi= s new mode
>> from
>> command line so that it can be used with git mergetool etc.
>> Something like:
>> meld LOCAL BASE REMOTE --output=3DMERGED --output_is_already_merge= d_switch
>> or
>> meld LOCAL MERGED REMOTE --base=3DBASE
>> And then:
>> 1) show regular 3-way diff if MERGED contains no conflict markers<= br> >> 2) alter MERGED content and show 3-way diff if MERGED contains dif= f3
>> markers (maybe, but not necessarily, offer switching to auto-merge= )
>> 3) show regular 3-way diff if MERGED contains non-diff3 conflict >> markers and offer switching to auto-merge
>
>
> I think doing the above should have the same effect as above - Show ME= RGED,
> but have the bar prompt to do a 're-merge' using auto-merge if= you want.

As in the other response, I'll try to write something up as to ho= w I
think these various scenarios should play out.

> I like the second command line version better.

As do I... though in reality I'm scared of command-line options. = Once
added, they pretty much become ABI, and we (or, more recently, I) get
to live with any mistakes encoded in them ~forever.

Any ne= w thoughts on this?=A0

=A0

Cheers,

Louis.

--20cf307f33aa20e90604d74c56cd-- From kai.willadsen@gmail.com Mon Mar 11 21:03:31 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id EBA0D76CA6 for ; Mon, 11 Mar 2013 21:03:31 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4tVhU3nyQ0zH for ; Mon, 11 Mar 2013 21:03:21 +0000 (UTC) Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by restaurant.gnome.org (Postfix) with ESMTP id B986976CA5 for ; Mon, 11 Mar 2013 21:03:20 +0000 (UTC) Received: by mail-we0-f174.google.com with SMTP id r6so3971147wey.33 for ; Mon, 11 Mar 2013 14:03:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=l6tcGHaCWFWZUBcvkU1gjBh9mUtj07axM9qvfW+9LSs=; b=kDLznutsGHkidcWVqfo/QhMmR8OI44WDjfltkrUPXrhZAr/v18GzA9wItNThcBTkpy ANO/TxRT9wIVW0SOtcy1Dg4zI/4auubDH/FYYNrq8gt9LBMmdHSE9OGYWbxG7Vu7yK+u ASx25D492zEU7MjImQZ49KqJaepK835MDRXeK9I2UOMlCq5tPSQrN5a/m36qBG/3odEf bO+ie63jnV11gkVW25VgD1ErxZqGn2Mw7nnUg7tVoa0c+2S3gWvTOADkDHYnv9DCn41B HC+k44ZQu1uXpgGWdjK+sc5PjAmaeksa47UnCod/PdR2eAyKLLburNB9BO2KMl60NVTI 1zDA== MIME-Version: 1.0 X-Received: by 10.180.74.131 with SMTP id t3mr15415265wiv.23.1363035798633; Mon, 11 Mar 2013 14:03:18 -0700 (PDT) Received: by 10.216.122.11 with HTTP; Mon, 11 Mar 2013 14:03:18 -0700 (PDT) In-Reply-To: References:

Date: Tue, 12 Mar 2013 07:03:18 +1000 Message-ID: Subject: Re: Meld 1.7.1 released From: Kai Willadsen To: Keegan Witt Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2013 21:03:32 -0000 On 3 March 2013 05:11, Keegan Witt wrote: > Not that I know of, but Perica hasn't posted the source for Portable Python > yet, so I can't be sure. There does seem to be a difference between it and > the regular Python installation. The portable version has the busy cursor, > as described before, but the regular installation seems to rapdily flash > between the busy and normal cursor. I've just pushed a couple of Windows fixes, one for translations and one for multiprocessing issues. I'm testing with upstream python and the all-in-one installer for pygtk, so I'd be interested to know what, if any, effect that second one has for your Portable Python packages. cheers, Kai From keeganwitt@gmail.com Mon Mar 11 23:10:18 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id C01D876CCA for ; Mon, 11 Mar 2013 23:10:18 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.698 X-Spam-Level: X-Spam-Status: No, score=-2.698 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id znVuWs+GW7RD for ; Mon, 11 Mar 2013 23:10:18 +0000 (UTC) Received: from mail-ie0-f171.google.com (mail-ie0-f171.google.com [209.85.223.171]) by restaurant.gnome.org (Postfix) with ESMTP id EC9D676CC9 for ; Mon, 11 Mar 2013 23:10:17 +0000 (UTC) Received: by mail-ie0-f171.google.com with SMTP id 10so5598387ied.30 for ; Mon, 11 Mar 2013 16:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=O+Yy7qgsFnT7I/OunlkVFuLbRSHGri0nScLQa1QdTJE=; b=WWfYMrmKo3SQPmbQ4ZwSMHs+uEmR7XcM1nmzJ/VO3yydDX1zVTTdFde/LbSbYnYGIa Z1/xVmRqr4uThe/s6+QAhyzFfhC6wJfrBvlL/2Tw3M+x8y6iPG1/IGQq6D01wxqJ2gSf XH4kYlds7Z3BbXpw86sZU/YP4yLBXXZyNbMxnY3ljBvVZ/nXOQe9y/awjfNUemEzUQqp chvPJtvcvSbhhpd8sIYj6mHdpeEu70L/z0hWWdkyo42EQd4ydpoHchiqqipgkc8y8QJ6 NkcZuI6PcOQEs8RHA7sJ8gUXOvfV1WkFo0ZQCpOTzT4wF3uEzWAR7ZObyHWBqnPlXUe8 6MSg== X-Received: by 10.50.88.233 with SMTP id bj9mr9481020igb.55.1363043416364; Mon, 11 Mar 2013 16:10:16 -0700 (PDT) MIME-Version: 1.0 Received: by 10.50.42.169 with HTTP; Mon, 11 Mar 2013 16:09:56 -0700 (PDT) In-Reply-To: References:

From: Keegan Witt Date: Mon, 11 Mar 2013 19:09:56 -0400 Message-ID: Subject: Re: Meld 1.7.1 released To: Kai Willadsen Content-Type: multipart/alternative; boundary=e89a8f23440fa5603f04d7ae4625 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2013 23:10:18 -0000 --e89a8f23440fa5603f04d7ae4625 Content-Type: text/plain; charset=UTF-8 I've not done a bunch of testing, but just from playing with it a few minutes, this seems like a substantial improvement. It also seems to have resolved the busy cursor issue we had discussed previously. Here's some pre-release files for people to test if they wish. http://dl.dropbox.com/u/4768521/meld-1.7.2.0.exe http://dl.dropbox.com/u/4768521/meld-1.7.2.0.zip -Keegan --e89a8f23440fa5603f04d7ae4625 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

I've not done a bunch of testing, but just from p= laying with it a few minutes, this seems like a substantial improvement.=C2= =A0 It also seems to have resolved the busy cursor issue we had discussed p= reviously.

Here's some pre-release files for people to test if they wis= h.

http://dl.dropbox.com/u/4768521/meld-1.7.2.0.exe

http://dl.dropbox.com/u/= 4768521/meld-1.7.2.0.zip

-Keegan

--e89a8f23440fa5603f04d7ae4625-- From keeganwitt@gmail.com Tue Mar 12 01:51:49 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 267A6769E3 for ; Tue, 12 Mar 2013 01:51:49 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.698 X-Spam-Level: X-Spam-Status: No, score=-2.698 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id we39DTYkr1hC for ; Tue, 12 Mar 2013 01:51:48 +0000 (UTC) Received: from mail-ie0-f175.google.com (mail-ie0-f175.google.com [209.85.223.175]) by restaurant.gnome.org (Postfix) with ESMTP id 935AE76994 for ; Tue, 12 Mar 2013 01:51:48 +0000 (UTC) Received: by mail-ie0-f175.google.com with SMTP id c12so5594900ieb.6 for ; Mon, 11 Mar 2013 18:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=zyU7ynjnTV4HzPF/Aktgs468xK9cmeQ5x5eGHTJYoWA=; b=UFpopMFeXCdHRpRLHOMpsg+mUBuBnwNp6bl8PbZFhBnbnTPdp9dOgf+BIGVZhqpnoN yHS/xS5PIdK8Vb5A40w1PEuRqYx8jBDjLu+IlUkD7ZCuFbJqPjyIqbe3DDme1xKMCeFT WdwEZWJtsRzZR/lVfrTw03ZsPZXOTTBj719qsWTQk3ic1ATUB4rqylyeWLe/eFSmM4YB AYT5fHqxStlwzLWZXfY5t1qFYphS1yot6CIdC4gIbeJVZf24zdor3MEbd0hvFoGZcAqv q18kH6SiJbbpW26SbTOvp5EXAFN0kne2newwCSxCvrWRC6eOMvLwZ82gDXVkZspjWkca 7SOg== X-Received: by 10.50.213.41 with SMTP id np9mr9618117igc.79.1363053106743; Mon, 11 Mar 2013 18:51:46 -0700 (PDT) MIME-Version: 1.0 Received: by 10.50.42.169 with HTTP; Mon, 11 Mar 2013 18:51:26 -0700 (PDT) In-Reply-To: References:

From: Keegan Witt Date: Mon, 11 Mar 2013 21:51:26 -0400 Message-ID: Subject: Re: Meld 1.7.1 released To: Kai Willadsen Content-Type: multipart/alternative; boundary=f46d04462eb63cd42504d7b088c0 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 01:51:49 -0000 --f46d04462eb63cd42504d7b088c0 Content-Type: text/plain; charset=UTF-8 For what it's worth, someone was asking about high CPU usage on my blog, and this patch seemed to resolve his issue as well (he tested the files I linked in my last post). -Keegan --f46d04462eb63cd42504d7b088c0 Content-Type: text/html; charset=UTF-8

For what it's worth, someone was asking about high CPU usage on my blog, and this patch seemed to resolve his issue as well (he tested the files I linked in my last post).

-Keegan

--f46d04462eb63cd42504d7b088c0-- From ezquerra@gmail.com Tue Mar 12 09:28:47 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 33AF076CD8 for ; Tue, 12 Mar 2013 09:28:47 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LFW3f4FGZrXy for ; Tue, 12 Mar 2013 09:28:46 +0000 (UTC) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by restaurant.gnome.org (Postfix) with ESMTP id B068476CAE for ; Tue, 12 Mar 2013 09:28:46 +0000 (UTC) Received: by mail-ve0-f174.google.com with SMTP id pb11so3344171veb.33 for ; Tue, 12 Mar 2013 02:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=/nRZ/q/p+Wr4ZQF0Yyf2MBU21MydkyccgHK1gSY3nZE=; b=P2OENA+fEFI7gDt3chSzvb4vEpcZJA8sLcadzz5CxSitWyodAOacf4P7C+5qF5Jhn2 M2/wxxoqNXlvWKDHB0kZC7UVxjvz9ed9eUv5iNIoaFJCvD5C3kYugXFDhosnbRJ2MgMj KecfQ19dzGeKmzsXTBElhxoj3WUu9kfJ8T5ONC5tW7jITHYLjzPc+G2AjlKKQC4ZVqTa YE1hrMlpms5TVT4st6IBaPkEHLil7BFkKmeIjAAG4lE8nOtv5NTSD2oXMSLxIu2+y1uP d5iajl5woNQKiJgELbaEl7exND4JCuFDlNBIms6mBv8FUUSj/h4tFWdOOulEtvDKGckC d9/Q== MIME-Version: 1.0 X-Received: by 10.52.64.208 with SMTP id q16mr5409313vds.93.1363080524796; Tue, 12 Mar 2013 02:28:44 -0700 (PDT) Sender: ezquerra@gmail.com Received: by 10.58.54.1 with HTTP; Tue, 12 Mar 2013 02:28:44 -0700 (PDT) In-Reply-To: References:

Date: Tue, 12 Mar 2013 10:28:44 +0100 X-Google-Sender-Auth: pIEZJk1s-CjkM4bG6iZL6-vHfrs Message-ID: Subject: Re: Meld 1.7.1 released From: Angel Ezquerra To: Keegan Witt Content-Type: text/plain; charset=ISO-8859-1 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 09:28:47 -0000 On Tue, Mar 12, 2013 at 2:51 AM, Keegan Witt wrote: > For what it's worth, someone was asking about high CPU usage on my blog, and > this patch seemed to resolve his issue as well (he tested the files I linked > in my last post). > > -Keegan I can confirm that this version works much better than the previous 1.7.1 version. I no longer see any "waiting cursors" and everything seems fast and appears to work well. Nice! Angel From kai.willadsen@gmail.com Tue Mar 12 21:51:19 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 7BD9976A6D for ; Tue, 12 Mar 2013 21:51:19 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fc+Jsj6npxbg for ; Tue, 12 Mar 2013 21:51:18 +0000 (UTC) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by restaurant.gnome.org (Postfix) with ESMTP id 489AA76CCA for ; Tue, 12 Mar 2013 21:51:17 +0000 (UTC) Received: by mail-wi0-f180.google.com with SMTP id hi8so278156wib.7 for ; Tue, 12 Mar 2013 14:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=fgxbQQcVNxIU5YYMt767J5s4JA/NnF1lXRPJIPdSwH8=; b=LVO0u4/B3f7cn5AkzJPaAqwu3PTwkO5aP+E9ZfJ+wABmv/pF4fLvjO6b2It3sOF0gf 8qK/DN7JGf0+tPWO7xBbxyA0RfTxQYxqNzsQAGc3aAQGj9CMnzNjmY0DKgzMoOSnt10U iNraBthYn8BRN0oiawerGvxYsbQyVHNstQEpI0TFwLcjKJNapKpPLTcdyhCh41yRFxsk 9fEglntGanjfwVey7lvdPgbQA/1DKLn56RldqNL5EcS4i8/xzGxoe/MvRJejrzB2uIoL F0U0nz5MCe22fKsS/Hyabw5x8yHoMSZ2eru8zVKshvRI49Z3V5WQsuTHSoFDZZifmU5c 65Tw== MIME-Version: 1.0 X-Received: by 10.194.92.231 with SMTP id cp7mr29872587wjb.19.1363125076059; Tue, 12 Mar 2013 14:51:16 -0700 (PDT) Received: by 10.216.122.11 with HTTP; Tue, 12 Mar 2013 14:51:15 -0700 (PDT) In-Reply-To: References:

Date: Wed, 13 Mar 2013 07:51:15 +1000 Message-ID: Subject: Re: Automatic 3 way merge for conflicts From: Kai Willadsen To: Louis des Landes Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 21:51:19 -0000 On 7 March 2013 12:19, Louis des Landes wrote: > Apologies for leaving this for so long... That's all good. I would have been hesitant to push this into 1.7.1 anyway. > I've updated the bug report yesterday, with updated patches which simply add > the ability to do a 3 way diff using existing MERGED output from the VCS. > (ie no auto-merge) I've pushed these patches and made a few minor changes, e.g., to still have the non-auto-merge case work properly with an output file. So basically most of this is done! > A re-review would be appreciated. > The SVN stuff may have to wait though. I've commented on the review, > specifically my approach to getting filenames was broken anyway, and instead > I'd have to do a glob for filename.r* and grab the last ones, not > particuarly nice. Yeah, it's awful that we would have to do this... I haven't spent any time looking to see whether there's a nicer way, but grabbing the highest r-numbers is just really, really dodgy. On the other hand, if SVN gives us nothing else, then I guess that's what we do. > To save time: > https://bugzilla.gnome.org/show_bug.cgi?id=690469 > >> > This would mean that even if the VCS isn't configured for (or doesn't >> > support) diff3 output, we still have a way of showing the BASE. >> >> Right, but... we can do this now. It's just about whether we want to >> trust the VC's merge, or our merge. I personally would prefer to trust >> the VC's, even at the cost of not being able to show BASE. >> >> I'm willing to be persuaded out of this position, but it might be >> difficult. In fact, it would probably be easier to just convince >> various VCs to give us diff3s. :) > > Do you have a way to convince git/svn to give us diff3s besides editing > config? (I coudn't find a way from command line only) > it's possible with bzr (bzr remerge --show-base) I believe you should be able to pass git -c merge.conflictstyle=diff3 (or similar) while triggering a re-merge, though I haven't tested. Either way, this doesn't need to be fixed immediately, and we can reconsider what the default should be before the next release. >> >> Fair enough. BTW, it would be awesome to see a way to run this new mode >> >> from >> >> command line so that it can be used with git mergetool etc. >> >> Something like: >> >> meld LOCAL BASE REMOTE --output=MERGED >> >> --output_is_already_merged_switch >> >> or >> >> meld LOCAL MERGED REMOTE --base=BASE >> >> And then: >> >> 1) show regular 3-way diff if MERGED contains no conflict markers >> >> 2) alter MERGED content and show 3-way diff if MERGED contains diff3 >> >> markers (maybe, but not necessarily, offer switching to auto-merge) >> >> 3) show regular 3-way diff if MERGED contains non-diff3 conflict >> >> markers and offer switching to auto-merge >> > >> > >> > I think doing the above should have the same effect as above - Show >> > MERGED, >> > but have the bar prompt to do a 're-merge' using auto-merge if you want. >> >> As in the other response, I'll try to write something up as to how I >> think these various scenarios should play out. >> >> > I like the second command line version better. >> >> As do I... though in reality I'm scared of command-line options. Once >> added, they pretty much become ABI, and we (or, more recently, I) get >> to live with any mistakes encoded in them ~forever. > > Any new thoughts on this? I really haven't had the time to do this, no. Since we lack any handling for diff-3 conflict markers, I don't know that it's a big deal. As far as I can see, we can do exactly what was outlined above without any additional command-line parameters... is that likely to break any external tools or anything? For now, I'd like to look into adding an infobar prompt to suggest 'Auto-merge' or 'Use existing merge' as options when we launch a 3-way diff on a conflict. cheers, Kai From dileepaha@gmail.com Wed Mar 13 10:22:29 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 384F376CCA for ; Wed, 13 Mar 2013 10:22:29 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.698 X-Spam-Level: X-Spam-Status: No, score=-2.698 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Er6DNTugrSx1 for ; Wed, 13 Mar 2013 10:22:28 +0000 (UTC) Received: from mail-ie0-f171.google.com (mail-ie0-f171.google.com [209.85.223.171]) by restaurant.gnome.org (Postfix) with ESMTP id F20BD7631D for ; Wed, 13 Mar 2013 10:22:27 +0000 (UTC) Received: by mail-ie0-f171.google.com with SMTP id 10so1173051ied.2 for ; Wed, 13 Mar 2013 03:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:mime-version:from:date:message-id:subject:to :content-type; bh=2RhFWSLktRinf1VF4+nCx5zoPE1oLp37zA7IQC58oKg=; b=QEJqRxXSY3ZYd60dpEvuGLZeaqBU63t++zn9ofaxGJ+mEshiT0BmtZK69uOJCrYipR IlEHVpZ5b5mLiIcemstnYguwg+BbbYSUL/fKqNXxr6c4rkNBICzdD57dd9AjgIKYhIMp /dLMxiGOhoHNJ4od0iKlRnR0GljS4FctOd2I08U1M0lmPlDWXk2vJF02/lvgBLwe74eH jiUOvfqfCHlCAncnPzYUOjsjRrm9GRuHuqzivEJW4OsegKGOk1tLqfT/YV2s2gs8ovXZ rvzxLABCKBTS4eyIQHagfsKmwFBocSKawDEVtf+kE64pOXJ9ba6CQmORl65Ze5CFLui0 WZ3g== X-Received: by 10.42.98.76 with SMTP id r12mr15562165icn.10.1363170146304; Wed, 13 Mar 2013 03:22:26 -0700 (PDT) MIME-Version: 1.0 Received: by 10.50.70.9 with HTTP; Wed, 13 Mar 2013 03:21:46 -0700 (PDT) From: Dilip S Date: Wed, 13 Mar 2013 15:51:46 +0530 Message-ID: Subject: Not able to invoke newly built meld 1.7.0 To: meld-list@gnome.org Content-Type: multipart/alternative; boundary=90e6ba614a9656cc0504d7cbc81a X-Mailman-Approved-At: Thu, 14 Mar 2013 08:02:38 +0000 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Mar 2013 10:22:29 -0000 --90e6ba614a9656cc0504d7cbc81a Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hello team, I recently installed meld 1.7.0 over RHEL5. I built the following dependencies (and also its associated dependencies): $ pkg-config --version 0.28 $ pkg-config --modversion pygtk-2.0 2.16.0 $ pkg-config --modversion pygobject-2.0 2.20.0 $ pkg-config --modversion python 2.7 export PKG_CONFIG=3D$PREFIX/pkg-config-0.28/bin/pkg-config export PKG_CONFIG_PATH=3D$PREFIX/zlib-1.2.7/lib/pkgconfig:$PREFIX/libffi-3.0.12/li= b/pkgconfig:$PREFIX/expat-2.1.0/lib/pkgconfig:$PREFIX/libelf-0.8.12/lib/pkg= config:$PREFIX/glib-2.22.4/lib/pkgconfig:$PREFIX/Python-2.7.3/lib/pkgconfig= :$PREFIX/pygobject-2.20.0/lib/pkgconfig:$PREFIX/tiff-4.0.0/lib/pkgconfig:$P= REFIX/libpng-1.5.14/lib/pkgconfig:$PREFIX/pixman-0.10.0/lib/pkgconfig:$PREF= IX/fontconfig-2.10.2/lib/pkgconfig:$PREFIX/freetype-2.4.10/lib/pkgconfig:$P= REFIX/cairo-1.6.0/lib/pkgconfig:$PREFIX/pango-1.20.5/lib/pkgconfig:$PREFIX/= atk-1.13.0/lib/pkgconfig:$PREFIX/gtk+-2.16.0/lib/pkgconfig:$PREFIX/pygtk-2.= 16.0/lib/pkgconfig:/usr/lib64/pkgconfig export PYTHON=3D$PREFIX/Python-2.7.3/bin/python2 export PYTHON_INCLUDES=3D$PREFIX/Python-2.7.3/include/python2.7 export PYTHON_PREFIX=3D$PREFIX/Python-2.7.3 export PYTHON_EXEC_PREFIX=3D$PREFIX/Python-2.7.3 export PATH=3D$PREFIX/pkg-config-0.28/bin:$PREFIX/Python-2.7.3/bin:$PATH export LD_LIBRARY_PATH=3D$PREFIX/Python-2.7.3/lib:$LD_LIBRARY_PATH =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D admnxpde@nl-cdc01_inv0190 $ ll /tools/meld/1.7.0 total 140 drwxr-xr-x 6 admnxpde support 4096 Mar 8 12:14 1.7.1 drwxr-xr-x 6 admnxpde support 4096 Mar 7 18:20 Python-2.7.3 drwxr-xr-x 5 admnxpde support 4096 Mar 8 05:39 atk-1.13.0 drwxr-xr-x 2 admnxpde support 4096 Mar 13 10:39 bin drwxr-xr-x 5 admnxpde support 4096 Mar 8 05:17 cairo-1.6.0 drwxr-xr-x 6 admnxpde support 4096 Mar 7 09:56 expat-2.1.0 drwxr-xr-x 8 admnxpde support 4096 Mar 8 04:42 fontconfig-2.10.2 drwxr-xr-x 6 admnxpde support 4096 Mar 8 05:01 freetype-2.4.10 drwxr-xr-x 6 admnxpde support 4096 Mar 7 11:41 gettext-0.16 drwxr-xr-x 6 admnxpde support 4096 Mar 7 13:39 glib-2.22.4 drwxr-xr-x 7 admnxpde support 4096 Mar 8 07:50 gtk+-2.16.0 drwxr-xr-x 6 admnxpde support 4096 Mar 8 06:00 jasper-1.900.1 drwxr-xr-x 6 admnxpde support 4096 Mar 7 21:00 jpeg-9 drwxr-xr-x 3 admnxpde support 4096 Mar 8 08:27 lib drwxr-xr-x 5 admnxpde support 4096 Mar 7 12:16 libelf-0.8.12 drwxr-xr-x 6 admnxpde support 4096 Mar 7 09:12 libffi-3.0.12 drwxr-xr-x 6 admnxpde support 4096 Mar 7 10:56 libiconv-1.14 drwxr-xr-x 6 admnxpde support 4096 Mar 7 21:19 libpng-1.5.14 drwxr-xr-x 7 admnxpde support 4096 Mar 8 05:28 pango-1.20.5 drwxr-xr-x 6 admnxpde support 4096 Mar 6 05:35 pcre-8.32 drwxr-xr-x 4 admnxpde support 4096 Mar 7 21:30 pixman-0.10.0 drwxr-xr-x 4 admnxpde support 4096 Mar 7 10:10 pkg-config-0.28 drwxr-xr-x 6 admnxpde support 4096 Mar 7 19:48 pygobject-2.20.0 drwxr-xr-x 6 admnxpde support 4096 Mar 8 08:08 pygtk-2.16.0 drwxr-xr-x 10 admnxpde support 4096 Mar 8 08:27 share drwxr-xr-x 6 admnxpde support 4096 Mar 7 21:07 tiff-4.0.0 drwxr-xr-x 3 admnxpde support 4096 Mar 8 08:27 var drwxr-xr-x 5 admnxpde support 4096 Mar 6 05:35 zlib-1.2.7 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Now, when I invoke meld, I get this error: $ ./meld Traceback (most recent call last): File "./meld", line 71, in import meld.paths ImportError: No module named meld.paths Note: Even meld 1.7.1 gives the same error. Can anybody help me to get around this problem? Thanks in advance, Dilip S --90e6ba614a9656cc0504d7cbc81a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Hello team,

=C2=A0

I recently installed meld 1.7.0 over RHEL5.

I built the following dependencies (and also its associated=C2=A0depen= dencies):

=C2=A0

$ pkg-config --version
0.28

$ pkg-config --modversion pygtk-2.0
2.16.0
$ pkg-config --modver= sion pygobject-2.0
2.20.0

$ pkg-config --modversion python
2.7

=C2=A0

export PKG_CONFIG=3D$PREFIX/pkg-config-0.28/bin/pkg-config

export PKG_CONFIG_PATH=3D$PREFIX/zlib-1.2.7/lib/pkgconfig:$PREFIX/= libffi-3.0.12/lib/pkgconfig:$PREFIX/expat-2.1.0/lib/pkgconfig:$PREFIX/libel= f-0.8.12/lib/pkgconfig:$PREFIX/glib-2.22.4/lib/pkgconfig:$PREFIX/Python-2.7= .3/lib/pkgconfig:$PREFIX/pygobject-2.20.0/lib/pkgconfig:$PREFIX/tiff-4.0.0/= lib/pkgconfig:$PREFIX/libpng-1.5.14/lib/pkgconfig:$PREFIX/pixman-0.10.0/lib= /pkgconfig:$PREFIX/fontconfig-2.10.2/lib/pkgconfig:$PREFIX/freetype-2.4.10/= lib/pkgconfig:$PREFIX/cairo-1.6.0/lib/pkgconfig:$PREFIX/pango-1.20.5/lib/pk= gconfig:$PREFIX/atk-1.13.0/lib/pkgconfig:$PREFIX/gtk+-2.16.0/lib/pkgconfig:= $PREFIX/pygtk-2.16.0/lib/pkgconfig:/usr/lib64/pkgconfig

export PYTHON=3D$PREFIX/Python-2.7.3/bin/python2
export PYTHON_= INCLUDES=3D$PREFIX/Python-2.7.3/include/python2.7
export PYTHON_PREFIX= =3D$PREFIX/Python-2.7.3
export PYTHON_EXEC_PREFIX=3D$PREFIX/Python-2.7.3=

=C2=A0

export PATH=3D$PREFIX/pkg-config-0.28/bin:$PREFIX/Python-2.7.3/bin:$PA= TH
export LD_LIBRARY_PATH=3D$PREFIX/Python-2.7.3/lib:$LD_LIBRARY_PATH

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D

admnxpde@nl-cdc01_inv0190= $=C2=A0 ll /tools/meld/1.7.0

total 140
drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 8 12:1= 4 1.7.1
drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 18:20 Pytho= n-2.7.3
drwxr-xr-x=C2=A0 5 admnxpde support 4096 Mar=C2=A0 8 05:39 atk-1= .13.0
drwxr-xr-x=C2=A0 2 admnxpde support 4096 Mar 13 10:39 bin
drwxr-xr-x=C2=A0 5 admnxpde support 4096 Mar=C2=A0 8 05:17 cairo-1.6.0
d= rwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 09:56 expat-2.1.0
dr= wxr-xr-x=C2=A0 8 admnxpde support 4096 Mar=C2=A0 8 04:42 fontconfig-2.10.2<= br>drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 8 05:01 freetype-2.4.= 10
drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 11:41 gettext-0.16
= drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 13:39 glib-2.22.4
d= rwxr-xr-x=C2=A0 7 admnxpde support 4096 Mar=C2=A0 8 07:50 gtk+-2.16.0
dr= wxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 8 06:00 jasper-1.900.1
drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 21:00 jpeg-9
drwxr-= xr-x=C2=A0 3 admnxpde support 4096 Mar=C2=A0 8 08:27 lib
drwxr-xr-x=C2= =A0 5 admnxpde support 4096 Mar=C2=A0 7 12:16 libelf-0.8.12
drwxr-xr-x= =C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 09:12 libffi-3.0.12
drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 10:56 libiconv-1.14drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 21:19 libpng-1.5.14drwxr-xr-x=C2=A0 7 admnxpde support 4096 Mar=C2=A0 8 05:28 pango-1.20.5drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 6 05:35 pcre-8.32
drwxr-xr-x=C2=A0 4 admnxpde support 4096 Mar=C2=A0 7 21:30 pixman-0.10.0drwxr-xr-x=C2=A0 4 admnxpde support 4096 Mar=C2=A0 7 10:10 pkg-config-0.28=
drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 19:48 pygobject-2.= 20.0
drwxr-xr-x=C2=A0 6 admnxpde support 4096 Mar=C2=A0 8 08:08 pygtk-2.= 16.0
drwxr-xr-x 10 admnxpde support 4096 Mar=C2=A0 8 08:27 share
drwxr-xr-x= =C2=A0 6 admnxpde support 4096 Mar=C2=A0 7 21:07 tiff-4.0.0
drwxr-xr-x= =C2=A0 3 admnxpde support 4096 Mar=C2=A0 8 08:27 var
drwxr-xr-x=C2=A0 5 = admnxpde support 4096 Mar=C2=A0 6 05:35 zlib-1.2.7

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D

=C2=A0

Now, when I invoke meld, I get this error:

=C2=A0

$ ./meld
Traceback (most recent call last):
=C2=A0 File "./= meld", line 71, in <module>
=C2=A0=C2=A0=C2=A0 import meld.pa= ths
ImportError: No module named meld.paths

=C2=A0

Note: Even meld 1.7.1 gives the same error.

=C2=A0

Can anybody help me to get around this problem?

=C2=A0

Thanks in advance,

Dilip S

=C2=A0

--90e6ba614a9656cc0504d7cbc81a-- From kai.willadsen@gmail.com Thu Mar 14 20:53:40 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id EFA5D76D76 for ; Thu, 14 Mar 2013 20:53:40 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id leaaBpEQpjXA for ; Thu, 14 Mar 2013 20:53:39 +0000 (UTC) Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by restaurant.gnome.org (Postfix) with ESMTP id 65CD476D5F for ; Thu, 14 Mar 2013 20:53:39 +0000 (UTC) Received: by mail-wg0-f47.google.com with SMTP id dr13so2395352wgb.26 for ; Thu, 14 Mar 2013 13:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=MZjmDOJ06wlSbjmL1Mpe/CJ4KGUXlEwxh4oa189tDlk=; b=COlvaimm7UnES7xA2qS/i70ZZSwaKEh8tvMCc+AGuO0VmxX+U434/KLlAgx9IiEItH ti2jSBRrxmLSgiLaHYKNzv9suL+zAtPPkOmLif11fxevmUzP2iNWv/ZE2KMBxugqfOJo fhovhDOqijFUZrr7ueurKCWlM/42Ys6HSv+Vqs2hE3j/5vX8DNSM5po/rKC7bY2QDmuI 7qziX6JnY6Yk6UU5Oq0oYUO37yqaa6oAhK+q7ZvV9Gv1J29dcdEWQASXLaHCHDcwwVGX rJjauCdZ8i3tM8FmYVifX+hIRC+Rcp5R/Pa4Usj1a8u4G9ud/0KaoxJEZNGToJp72CE5 thQw== MIME-Version: 1.0 X-Received: by 10.180.87.129 with SMTP id ay1mr6780838wib.1.1363294417310; Thu, 14 Mar 2013 13:53:37 -0700 (PDT) Received: by 10.216.122.11 with HTTP; Thu, 14 Mar 2013 13:53:37 -0700 (PDT) In-Reply-To: References: Date: Fri, 15 Mar 2013 06:53:37 +1000 Message-ID: Subject: Re: Not able to invoke newly built meld 1.7.0 From: Kai Willadsen To: Dilip S Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Mar 2013 20:53:41 -0000 On 13 March 2013 20:21, Dilip S wrote: > Hello team, > > I recently installed meld 1.7.0 over RHEL5. > I built the following dependencies (and also its associated dependencies): > Now, when I invoke meld, I get this error: > > $ ./meld > Traceback (most recent call last): > File "./meld", line 71, in > import meld.paths > ImportError: No module named meld.paths > > Note: Even meld 1.7.1 gives the same error. > > Can anybody help me to get around this problem? How did you install Meld itself? That error means that Meld can't find its own modules. Did you move the main bin/meld script, get rid of the meld.doap file, or install it in any way other than make install? The easiest way to try to get Meld working is to simply download, unarchive, and run bin/meld. If that works, then something has gone wrong in your previous installation. Also, there was a small patch that went in straight after Meld 1.7.1 was released for better pygtk 2.16 compatibility, so you may want to look at patching that. cheers, Kai From kai.willadsen@gmail.com Thu Mar 14 21:15:34 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id F3E8776D81 for ; Thu, 14 Mar 2013 21:15:33 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZaLO84xEQGGN for ; Thu, 14 Mar 2013 21:15:33 +0000 (UTC) Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by restaurant.gnome.org (Postfix) with ESMTP id 3481176DDA for ; Thu, 14 Mar 2013 21:15:30 +0000 (UTC) Received: by mail-wi0-f177.google.com with SMTP id hm14so2249552wib.10 for ; Thu, 14 Mar 2013 14:15:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=rbODACJkC9rB5dTVRPY1AyawPfkbLEa7Pinvg8+i7+0=; b=PpLcPBj7HQMOWtWihEUQ9TugcifOtRMXJsdL0f95zUCl4DyXREkadHqpek5FptpsBU hSUD6SFMRDaNO8gbHDdcJ6P/yoCrSZGGOutOy0q/GASx6EU3OKsgpb1dGzkg3uXaAUgg 31E35MRJ0cvIkMAdy4tdyOFWgtkU/JHXZdM9/PGHrxzyfzuhhzUCppR+3XJ/KqMa+MCJ YwN7EFf8yD5vna8RvAXhVZzSnwtx30mEIZQau0T/n57idscuM7RPbzGErpGvUy8gVBHe Af6nm2qu9RhfRnHY0VwjlLSzKBr2+eOrgm12x5qEpuu1I8enNtaLzGVKQWHC0+3+b7ge 1AfQ== MIME-Version: 1.0 X-Received: by 10.180.100.10 with SMTP id eu10mr36862114wib.4.1363295729057; Thu, 14 Mar 2013 14:15:29 -0700 (PDT) Received: by 10.216.122.11 with HTTP; Thu, 14 Mar 2013 14:15:28 -0700 (PDT) In-Reply-To: References:

Date: Fri, 15 Mar 2013 07:15:28 +1000 Message-ID: Subject: Re: "static/fixed" mode on file diff view From: Kai Willadsen To: Pedro Pedruzzi Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Mar 2013 21:15:34 -0000 On 7 March 2013 07:04, Pedro Pedruzzi wrote: > On Fri, Mar 1, 2013 at 5:49 PM, Kai Willadsen wrote: >> On 26 February 2013 06:58, Pedro Pedruzzi wrote: > Thanks for the pointers. > > I've came up with this proof-of-concept based on the second option. > The tags isn't getting updated on buffer change yet. This is just to > demonstrate how would it look and feel. > > Please, tell me what you think. I'm actually surprised how well that works! I think we need to figure out a way of doing what other diff tools do, and indicating the areas that have been inserted to get the alignment right. I'm not sure whether GtkTextView will let us do that easily, but we can see. I've just had an alternative crazy idea. If tags don't give us the flexibility we need, we could always insert a custom GTK widget after each chunk, and give allocation to the widget based on required padding. That should allow us to use whatever presentation we like. ...don't do that though. That's a crazy idea. > I have some questions: > > 1. Where is a good place to do the tag creation? I tried somewhere in > the constructor but it seems that the linediffer was not ready to > iterate over changes yet. I can't see any way of getting away from having a tag per chunk, which means that there's no way to do it in the constructor. You can do this is many places, but FileDiff._diff_files() is the first place where we're guaranteed to have the diffs. Of course, those diffs can change, and if they do then we'll get a callback to FileDiff.on_diffs_changed(), which would probably be the right place to update and revalidate tags. > 2. How about 3 way filediffs? I would need to iterate over chunks on > the 3 panes. Exactly. Things are always complicated by 3-way diffs, but in this case I think it's just a matter of adapting your code to use linediffer.all_changes() instead of single_changes() and taking the max of three offsets rather than of two. cheers, Kai From kai.willadsen@gmail.com Thu Mar 14 21:20:33 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id F313276D75 for ; Thu, 14 Mar 2013 21:20:32 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wFpcRAZbyPVl for ; Thu, 14 Mar 2013 21:20:32 +0000 (UTC) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by restaurant.gnome.org (Postfix) with ESMTP id 070FA76D5F for ; Thu, 14 Mar 2013 21:20:31 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id t57so2640958wey.27 for ; Thu, 14 Mar 2013 14:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=a8x7VxLQ/od0lRz7tKBIRfoDoTKL4QTk5SI+QToCdCY=; b=jISSMUkSKTfZG5CLvd/Bw8bioMMgBD93wwXcNCiVkFarxGu1LZ6kqynFMX4eloGcC8 tv84HZcg61lgiFXjTpNJ2UIdcwdLqjEBbr38QsPhX8roe6tEMnSw72+GABVQtfcv71RJ bIY/gt6cKERgM4/12Uec+0IYlmCnqCmXBo916jqqIXo9w28VrIAX0vvriE7b0eW71Pac UguSmBHmwQTvQqGlcieHfLgQoWDJjvgewK8XalcSOCe3erodWjWVxiOg5SxwltfpcjZl 0lh16mMfPRD3es9IPss29sFzeIEYMUa3X2TxfNJ2RQnkQmgO7BC8TC4etvkJpF1ddK/O 18aQ== MIME-Version: 1.0 X-Received: by 10.194.92.231 with SMTP id cp7mr7071890wjb.19.1363296024157; Thu, 14 Mar 2013 14:20:24 -0700 (PDT) Received: by 10.216.122.11 with HTTP; Thu, 14 Mar 2013 14:20:24 -0700 (PDT) In-Reply-To: <512F8114.6030905@nta-inc.net> References: <512F8114.6030905@nta-inc.net> Date: Fri, 15 Mar 2013 07:20:24 +1000 Message-ID: Subject: Re: Bug in directory view From: Kai Willadsen To: Jeff Webb Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Mar 2013 21:20:33 -0000 On 1 March 2013 02:08, Jeff Webb wrote: > There seems to be a "bug" in meld's directory view. If the > Preferences->Text Filters->"Ignore changes which insert or delete blank > lines" checkbox is enabled, files which differ only by blank lines show up > as being different in the directory view. If you click on one of these > files in the directory view, the file diff shows no differences, as > expected. It seems like the fix could be as simple as something like what > is shown in the patch below. You may want to do something more efficient, > but it seems that something like this is needed here. This fix is very > useful in conjunction with something like the "C++ comment" filter when you > are comparing different revisions of a project and want to find the files > that have non-comment differences. We were trying to do this in a case > where someone changed a revision number comment in every file. This fix > seems to work for our test case. That also won't work for unicode or mac linebreaks, so we'd need to establish a list of linebreaks that would be ignored in FileDiff by the preference (which will then break when GTK or Python changes their definitions, but hey). I'd like to fix the bug, but I don't want to encourage the idea that that should work. I have to admit that it never occurred to me that the blank line ignoring *would* propagate across to folder comparisons. Basically, it's only there cause our filters can't handle new lines. Could I ask you to file a bug please, and I'll take a look at a more general patch? cheers, Kai From sveinse@seldal.com Fri Mar 15 11:58:05 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 7F2CB76DA2 for ; Fri, 15 Mar 2013 11:58:05 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TOUFwwmZNvVf for ; Fri, 15 Mar 2013 11:57:54 +0000 (UTC) X-Greylist: delayed 387 seconds by postgrey-1.34 at restaurant.gnome.org; Fri, 15 Mar 2013 11:57:54 UTC Received: from smtp.domeneshop.no (smtp.domeneshop.no [194.63.252.54]) by restaurant.gnome.org (Postfix) with ESMTP id 9019C76D8D for ; Fri, 15 Mar 2013 11:57:54 +0000 (UTC) Received: from [79.160.140.131] (port=20076 helo=[128.1.101.181]) by smtp.domeneshop.no with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1UGTAS-0002yE-8a for meld-list@gnome.org; Fri, 15 Mar 2013 12:51:24 +0100 Message-ID: <51430B3B.8070804@seldal.com> Date: Fri, 15 Mar 2013 12:51:23 +0100 From: Svein Seldal User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: meld-list Subject: Use meld to diff a list of files Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 11:58:05 -0000 Hi I'm working on a small python script. I have two dirs and my script generates a list of files that I want to diff. Can I integrate meld into my python script and use it to show the diffs for that (specific) file list? If it works, how can I do that? Best regards, Svein Seldal From jeff.webb@nta-inc.net Fri Mar 15 14:33:01 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 2D7CC76DC0 for ; Fri, 15 Mar 2013 14:33:01 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=2 tests=[BAYES_00=-1.9] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6pAILgyxi6yI for ; Fri, 15 Mar 2013 14:33:00 +0000 (UTC) Received: from c370-1.amrdec.army.mil (c370-1.amrdec.army.mil [199.209.144.46]) by restaurant.gnome.org (Postfix) with ESMTP id 4E81F76DA2 for ; Fri, 15 Mar 2013 14:32:59 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.84,850,1355119200"; d="scan'208";a="18652230" Received: from unknown (HELO RD-Bridge.ds.amrdec.army.mil) ([10.0.60.29]) by c370-1.amrdec.army.mil with ESMTP; 15 Mar 2013 09:32:57 -0500 Received: from [10.0.144.65] ([10.0.144.65]) by RD-Bridge.ds.amrdec.army.mil with Microsoft SMTPSVC(6.0.3790.4675); Fri, 15 Mar 2013 09:32:57 -0500 Message-ID: <51433119.3040207@nta-inc.net> Date: Fri, 15 Mar 2013 09:32:57 -0500 From: Jeff Webb User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Kai Willadsen Subject: Re: Bug in directory view References: <512F8114.6030905@nta-inc.net> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 15 Mar 2013 14:32:57.0894 (UTC) FILETIME=[FCFC1C60:01CE2189] X-Mailman-Approved-At: Fri, 15 Mar 2013 20:11:34 +0000 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 14:33:01 -0000 On 03/14/2013 04:20 PM, Kai Willadsen wrote: > On 1 March 2013 02:08, Jeff Webb wrote: >> There seems to be a "bug" in meld's directory view. If the >> Preferences->Text Filters->"Ignore changes which insert or delete blank >> lines" checkbox is enabled, files which differ only by blank lines show up >> as being different in the directory view. If you click on one of these >> files in the directory view, the file diff shows no differences, as >> expected. It seems like the fix could be as simple as something like what >> is shown in the patch below. You may want to do something more efficient, >> but it seems that something like this is needed here. This fix is very >> useful in conjunction with something like the "C++ comment" filter when you >> are comparing different revisions of a project and want to find the files >> that have non-comment differences. We were trying to do this in a case >> where someone changed a revision number comment in every file. This fix >> seems to work for our test case. > > That also won't work for unicode or mac linebreaks, so we'd need to > establish a list of linebreaks that would be ignored in FileDiff by > the preference (which will then break when GTK or Python changes their > definitions, but hey). That sounds like a good solution to me. I was also worried that the patch I posted may slow things down for large directory diffs, since it is an extra step to run on each file. Perhaps being able to enable this feature in the dirdiff "Filters" drop-down would be a good idea, if that is an issue. > I'd like to fix the bug, but I don't want to encourage the idea that > that should work. I have to admit that it never occurred to me that > the blank line ignoring *would* propagate across to folder > comparisons. Basically, it's only there cause our filters can't handle > new lines. My use case really has to do with the text filters as well, so I think the bug is legitimate in that context. As you mentioned, if the filters could handle new lines, this feature wouldn't matter very much. In my case, I want to see only non-comment differences between two revisions of a source tree. Someone decided that putting a revision number (and change log) in every file was a good idea, so it looks like every file has changed between the two revisions. With my patch applied, I can see which files have significant changes without having to examine every one individually. When I examined the meld source code, I discovered that the underlying issue was that even though the text filters were applied, the line differences elimination code was not. That's why I described the bug the way I did. I thought it would be more clear to not mention the text filters, since that part seems to be working properly. > Could I ask you to file a bug please, and I'll take a look at a more > general patch? Sure. I just filed Bug 695912: https://bugzilla.gnome.org/show_bug.cgi?id=695912 Thanks for taking the time to examine this issue. Also, thank you for your work on meld. My coworkers and I find the tool very useful. I also love that it's written in python -- that made it easy to dive in and fix the issue. -Jeff From kai.willadsen@gmail.com Fri Mar 15 20:20:55 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 2FCDB76DC0 for ; Fri, 15 Mar 2013 20:20:55 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n8UEwrRuFdZG for ; Fri, 15 Mar 2013 20:20:45 +0000 (UTC) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by restaurant.gnome.org (Postfix) with ESMTP id BEBE676DC9 for ; Fri, 15 Mar 2013 20:20:44 +0000 (UTC) Received: by mail-wi0-f172.google.com with SMTP id ez12so913347wid.17 for ; Fri, 15 Mar 2013 13:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=tmY+dSjwmpocmsfVZUqcrjti77aRL7L6HJOhEz2McZA=; b=e0vZZER/8HR18avcogp4eG5pjHvzrwgTy6RsN9CAq+NK5YzBmMNRCfXQ3c0Oz74lN3 gW+YRWF7oxC2X8w7sFggVXL8wbGI4IQj62hRC5kVm2IZOVAFrk3ueD631K+1xwH82J+Y 0UMcMFtIkoI/nIA6py05zN2f8HdaIErTJ1kL5KTuXmcjqs/5x1Mwo/OmyZqOoJvmpEDF gZ/HTIdaD8h2ncZpElhFHW347OMpkXT9ZjzWRHZDlZizBEg5gDB8nIL9kNg17RWAaV1W PZOIrcHEnWF3Fvx0tngsrV+MCogYLX+BmCXfsPX8FQOMVi9WQW5x/mJ0lJ+AUD44wN79 K5Yg== MIME-Version: 1.0 X-Received: by 10.194.176.165 with SMTP id cj5mr13324166wjc.37.1363378842537; Fri, 15 Mar 2013 13:20:42 -0700 (PDT) Received: by 10.216.122.11 with HTTP; Fri, 15 Mar 2013 13:20:42 -0700 (PDT) In-Reply-To: <51430B3B.8070804@seldal.com> References: <51430B3B.8070804@seldal.com> Date: Sat, 16 Mar 2013 06:20:42 +1000 Message-ID: Subject: Re: Use meld to diff a list of files From: Kai Willadsen To: Svein Seldal Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 20:20:55 -0000 On 15 March 2013 21:51, Svein Seldal wrote: > Hi > > I'm working on a small python script. I have two dirs and my script > generates a list of files that I want to diff. Can I integrate meld into my > python script and use it to show the diffs for that (specific) file list? If > it works, how can I do that? I think you want the --diff command line argument, which launches a tab for a two or three-way comparison. You can give Meld this argument as many times as you like, and all of the comparisons will be launched in tabs in a single window. cheers, Kai From dmacks@netspace.org Fri Mar 15 20:43:27 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 0B95576DC0 for ; Fri, 15 Mar 2013 20:43:27 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -0.921 X-Spam-Level: X-Spam-Status: No, score=-0.921 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, FROM_EXCESS_BASE64=0.979, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=no Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZaxOgjJd9FoA for ; Fri, 15 Mar 2013 20:43:16 +0000 (UTC) Received: from mail39c40.carrierzone.com (mail39c40.carrierzone.com [209.235.156.179]) by restaurant.gnome.org (Postfix) with ESMTP id 7B7BD76DC9 for ; Fri, 15 Mar 2013 20:43:15 +0000 (UTC) Received: from mail39c40.carrierzone.com (localhost [127.0.0.1]) by mail39c40.carrierzone.com (8.13.6/8.13.1) with ESMTP id r2FKhCge008722 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 15 Mar 2013 20:43:13 +0000 Received: (from webmail@localhost) by mail39c40.carrierzone.com (8.13.6/8.12.2/Submit) id r2FKhC81008721 for meld-list@gnome.org; Fri, 15 Mar 2013 16:43:12 -0400 Received: from pool-96-244-146-185.bltmmd.fios.verizon.net (pool-96-244-146-185.bltmmd.fios.verizon.net [96.244.146.185]) by webmail.netspace.org (Webmail 5.0 V.V.I.) with HTTP for ; Fri, 15 Mar 2013 16:43:12 -0400 Message-ID: <20130315164312.paq4nqv68ckck4cw@webmail.netspace.org> From: "=?utf-8?b?RGFuaWVsIE1hY2tz?=" To: meld-list@gnome.org Subject: Python diagnostic in vc-mode for git Date: Fri, 15 Mar 2013 16:43:12 -0400 X-Priority: 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Webmail 6.0 X-CSC: 0 X-CHA: v=2.0 cv=bcTcppzB c=1 sm=1 a=WgqlhV2pB5zgkiz5y38hRw==:17 a=Q5QLeeme7KwA:10 a=TFD_Mn-G-E4A:10 a=T6QNPRnjHn8A:10 a=IkcTkHD0fZMA:10 a=htD9qdewAAAA:8 a=CfS3303VTYEA:10 a=DZNxciZNtYQbzIJPtG8A:9 a=QEXdDO2ut3YA:10 a=lQSODCMphPEA:10 a=WkljmVdYkabdwxfqvArNOQ==:117 X-CTCH-RefID: str=0001.0A020204.514387E1.0044, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 20:43:27 -0000 I have a local clone of a github project. 'meld fink-git' (the local direct= ory name) or 'meld' and then choosing 'version control view' to select it d= isplays "fink-git" with a folder-icon. But if I double-click it, the termin= al reports: Traceback (most recent call last): =C2=A0 File "/sw/lib/meld/meld/vcview.py", line 433, in on_row_activated =C2=A0=C2=A0=C2=A0 self.run_diff( [path] ) =C2=A0 File "/sw/lib/meld/meld/vcview.py", line 468, in run_diff =C2=A0=C2=A0=C2=A0 comp_path =3D self.vc.get_path_for_repo_file(path) =C2=A0 File "/sw/lib/meld/meld/vc/git.py", line 90, in get_path_for_repo_fi= le =C2=A0=C2=A0=C2=A0 raise _vc.InvalidVCPath(self, path, "Path not in reposit= ory") meld.vc._vc.InvalidVCPath: Git: Path /usr/local/fink/fink-git is invalid or= not present Error: Path not in repository and the GUI does not switch to the repo view. I get the same effect for a c= lone of a git.gnome project. Other VCs seem to work (a CVS checkout switche= s to VC view (expandable tree-view, erc.) dan -- Daniel Macks dmacks@netspace.org From kai.willadsen@gmail.com Fri Mar 15 21:02:08 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 466FD76DC9 for ; Fri, 15 Mar 2013 21:02:08 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oQG3L9go3Od5 for ; Fri, 15 Mar 2013 21:01:58 +0000 (UTC) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by restaurant.gnome.org (Postfix) with ESMTP id DA59176DC0 for ; Fri, 15 Mar 2013 21:01:57 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id t57so3660644wey.13 for ; Fri, 15 Mar 2013 14:01:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=NFX6JC35flSdJjSJ/PKw7a01a7wrg6yT6CsB7PilnIM=; b=UiqKwAMmzDVtGPYgI3RHpBR5+50MIragY23UU1Q9yxBpxr3RcpIdtWPmh6+QDbtK8B fOoKx4epD0M4CnXCv4xNXrTuO5lQknqX1P+Ev0l7/JN44HHFaMsYcvQ02tGACCozqhuG K3UgCZ3MxBFia5woDkZ4dRhxOv8SDM0HUha1J1I1pzIcTRMNsTANaOyrtgRd0JA+Rh+X 601ZXXhnsNHkBqx+z0DozzXJvym9ciT41hMzwA9F+bn7nx43MtdAJg4FOGKjAhHfcPX6 M4+lGb65oz5bolbswW6jl3dAK6GCHIOhdP2OzB0jWFcF6Ga+9PDdS/E10zZ11IbrTO2A lpDA== MIME-Version: 1.0 X-Received: by 10.180.100.10 with SMTP id eu10mr5532493wib.4.1363381315819; Fri, 15 Mar 2013 14:01:55 -0700 (PDT) Received: by 10.216.122.11 with HTTP; Fri, 15 Mar 2013 14:01:55 -0700 (PDT) In-Reply-To: <20130315164312.paq4nqv68ckck4cw@webmail.netspace.org> References: <20130315164312.paq4nqv68ckck4cw@webmail.netspace.org> Date: Sat, 16 Mar 2013 07:01:55 +1000 Message-ID: Subject: Re: Python diagnostic in vc-mode for git From: Kai Willadsen To: Daniel Macks Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 21:02:08 -0000 On 16 March 2013 06:43, Daniel Macks wrote: > I have a local clone of a github project. 'meld fink-git' (the local directory > name) or 'meld' and then choosing 'version control view' to select it displays > "fink-git" with a folder-icon. But if I double-click it, the terminal reports: > > Traceback (most recent call last): > File "/sw/lib/meld/meld/vcview.py", line 433, in on_row_activated > self.run_diff( [path] ) > File "/sw/lib/meld/meld/vcview.py", line 468, in run_diff > comp_path = self.vc.get_path_for_repo_file(path) > File "/sw/lib/meld/meld/vc/git.py", line 90, in get_path_for_repo_file > raise _vc.InvalidVCPath(self, path, "Path not in repository") > meld.vc._vc.InvalidVCPath: Git: Path /usr/local/fink/fink-git is invalid or not present > Error: Path not in repository Oh that's new... that's a regression in 1.7.1, so thanks for finding it. > and the GUI does not switch to the repo view. I get the same effect for a > clone of a git.gnome project. Other VCs seem to work (a CVS checkout > switches to VC view (expandable tree-view, erc.) Hey, look at that! I had no idea we did that. That's actually switching to a single-pane folder comparison. I'm not certain what the desired behaviour here is, as I don't really understand what the previous behaviour is good for, but I'm open to explanations. Anyway, in the interests of not dumping tracebacks, I've pushed a change to git that restores what I think our previous behaviour was. Please let me know if it's not right. cheers, Kai From kai.willadsen@gmail.com Fri Mar 15 21:03:13 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 8AB1376DC0 for ; Fri, 15 Mar 2013 21:03:13 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aPU9ujx2yw8i for ; Fri, 15 Mar 2013 21:03:03 +0000 (UTC) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by restaurant.gnome.org (Postfix) with ESMTP id 19ACF76DC9 for ; Fri, 15 Mar 2013 21:03:02 +0000 (UTC) Received: by mail-wg0-f45.google.com with SMTP id dq12so3379793wgb.0 for ; Fri, 15 Mar 2013 14:03:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=uUmX1y1eCxf34YY55RUOwCKiwEeu9KsGg38YknCQ120=; b=tTZxvWP9SqAF7GNheaM/3vXNhw2kAkstmj9SMXYLWqY4+cIfA0eGPVlNtcg/L12BkN vilgiqii/G7cpwswqA0SLDOMkihGGDwK/suETTLkKJclvAmRk6o52l9JJylXQSIPQBxk GdDS3BJSXTk65hnpwQaribqQfCURgGqBNBtX/4EeDytmD4Mn9tw1ms25k7TQVJ3ekdv+ XMkkYAjRBsXNoTVJ/OSUiepQMWaHSwNkGetgkQfFJET2Cg3E9aOLhXCI4Z3e/89oxCqp JNWr1aD2Df1o1MlDUj4kI3qLa7gNiXOQFRux0nI7bTScTtrRUCStj0Dg/NnsFq5gwFkl ksmQ== MIME-Version: 1.0 X-Received: by 10.194.11.70 with SMTP id o6mr13217767wjb.29.1363381380880; Fri, 15 Mar 2013 14:03:00 -0700 (PDT) Received: by 10.216.122.11 with HTTP; Fri, 15 Mar 2013 14:03:00 -0700 (PDT) In-Reply-To: <51433119.3040207@nta-inc.net> References: <512F8114.6030905@nta-inc.net> <51433119.3040207@nta-inc.net> Date: Sat, 16 Mar 2013 07:03:00 +1000 Message-ID: Subject: Re: Bug in directory view From: Kai Willadsen To: Jeff Webb Content-Type: text/plain; charset=UTF-8 Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 21:03:13 -0000 On 16 March 2013 00:32, Jeff Webb wrote: > On 03/14/2013 04:20 PM, Kai Willadsen wrote: >> That also won't work for unicode or mac linebreaks, so we'd need to >> establish a list of linebreaks that would be ignored in FileDiff by >> the preference (which will then break when GTK or Python changes their >> definitions, but hey). > > That sounds like a good solution to me. I was also worried that the patch I > posted may slow things down for large directory diffs, since it is an extra > step to run on each file. Perhaps being able to enable this feature in the > dirdiff "Filters" drop-down would be a good idea, if that is an issue. Of the many very-slow things that we do in directory comparisons, that one shouldn't be a real problem. It is, essentially, just applying another filter if the option is set. >> I'd like to fix the bug, but I don't want to encourage the idea that >> that should work. I have to admit that it never occurred to me that >> the blank line ignoring *would* propagate across to folder >> comparisons. Basically, it's only there cause our filters can't handle >> new lines. > > > My use case really has to do with the text filters as well, so I think the > bug is legitimate in that context. As you mentioned, if the filters could > handle new lines, this feature wouldn't matter very much. In my case, I > want to see only non-comment differences between two revisions of a source > tree. Someone decided that putting a revision number (and change log) in > every file was a good idea, so it looks like every file has changed between > the two revisions. With my patch applied, I can see which files have > significant changes without having to examine every one individually. When > I examined the meld source code, I discovered that the underlying issue was > that even though the text filters were applied, the line differences > elimination code was not. That's why I described the bug the way I did. I > thought it would be more clear to not mention the text filters, since that > part seems to be working properly. Sure. The problem from my point of view is that the ignore-blank-lines setting is intended as a visual aid in file comparisons, and here it's being repurposed. I certainly think the use case is reasonable; I just wish that we weren't using the ignore-blank-lines setting for it. I can live with it for now though. >> Could I ask you to file a bug please, and I'll take a look at a more >> general patch? > > > Sure. I just filed Bug 695912: > > https://bugzilla.gnome.org/show_bug.cgi?id=695912 > > Thanks for taking the time to examine this issue. Also, thank you for your > work on meld. My coworkers and I find the tool very useful. I also love > that it's written in python -- that made it easy to dive in and fix the > issue. Thanks! Always nice to hear that people find it useful. cheers, Kai From gilboad@gmail.com Sat Mar 16 04:57:37 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 6065876DDA for ; Sat, 16 Mar 2013 04:57:37 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.698 X-Spam-Level: X-Spam-Status: No, score=-2.698 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M6gxFztmRTt1 for ; Sat, 16 Mar 2013 04:57:36 +0000 (UTC) Received: from mail-ie0-f170.google.com (mail-ie0-f170.google.com [209.85.223.170]) by restaurant.gnome.org (Postfix) with ESMTP id C5B8A76DC9 for ; Sat, 16 Mar 2013 04:57:36 +0000 (UTC) Received: by mail-ie0-f170.google.com with SMTP id c11so5246105ieb.1 for ; Fri, 15 Mar 2013 21:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to :content-type; bh=s4tPl+iPC4v0/7fB8GrVJUNznbmgx3xgXkrn/dX0iDQ=; b=JkUQP7Z8x9a+yTmu2JNKwlTl0cK/C7FmxK76A9/a8KinYB0l9Yz/NLEKKA0fFKNaOp YxbjbiQ5Jq5IcQ+XtR93ynIsBziXFn46RAq4Zd5raCxTtd2pLISS6lY9rEH/7IRrRmLZ PrWTcHbqluaDLJeX0jsOcyYj31DiJzfHvB4ja5VwfiHlvaUmfC83PL7tb2jpOVcUgtSU BOkI8h6x+obRvBkCFUiLV9t9SOmtCuJ7Gv5mzrldDe23GEcgq3YuWllJl3hTMz3TmLfp HhXLQB3WtvsNtInFWhjCijUbGsuo2NJOCnATEf+8QGTTxTmUnV7Y/8oBGHMj3v44Xpay bmnA== MIME-Version: 1.0 X-Received: by 10.50.47.170 with SMTP id e10mr2976113ign.84.1363409854983; Fri, 15 Mar 2013 21:57:34 -0700 (PDT) Received: by 10.64.7.99 with HTTP; Fri, 15 Mar 2013 21:57:34 -0700 (PDT) Date: Sat, 16 Mar 2013 06:57:34 +0200 Message-ID: Subject: Support for DBUS-less mode. From: Gilboa Davara To: "Users/Devel Meld" Content-Type: multipart/alternative; boundary=14dae9340e3b16f69104d80398e0 X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 04:57:37 -0000 --14dae9340e3b16f69104d80398e0 Content-Type: text/plain; charset=ISO-8859-1 Hello, When trying to used meld to compare files as root, I'm getting exceptions due to meld being unable to connect to DBUS (access denied). (meld:29000): GConf-WARNING **: Client failed to connect to the D-BUS daemon: Did not receive a reply. Possible causes include: the remote application did not send a reply, the message bus security policy blocked the reply, the reply timeout expired, or the network connection was broken. Traceback (most recent call last): File "/usr/bin/meld", line 154, in main() File "/usr/bin/meld", line 136, in main import meld.meldapp File "/usr/share/meld/meld/meldapp.py", line 216, in app = MeldApp() File "/usr/share/meld/meld/meldapp.py", line 113, in __init__ self.prefs = preferences.MeldPreferences() File "/usr/share/meld/meld/preferences.py", line 259, in __init__ super(MeldPreferences, self).__init__("/apps/meld", self.defaults) File "/usr/share/meld/meld/util/prefs.py", line 93, in __init__ self._gconf.add_dir(rootkey, gconf.CLIENT_PRELOAD_NONE) glib.GError: No D-BUS daemon running Any chance of making meld simply disable dbus support when dbus is unavailable? - GIlboa --14dae9340e3b16f69104d80398e0 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable

Hello,

When trying to used meld to compa= re files as root, I'm getting exceptions due to meld being unable to co= nnect to DBUS (access denied).

(meld:29000): GConf-WARNING **: Clien= t failed to connect to the D-BUS daemon:
Did not receive a reply. Possible causes include: the remote application di= d not send a reply, the message bus security policy blocked the reply, the = reply timeout expired, or the network connection was broken.
Traceback (= most recent call last):
=A0 File "/usr/bin/meld", line 154, in <module>
=A0=A0= =A0 main()
=A0 File "/usr/bin/meld", line 136, in main
=A0= =A0=A0 import meld.meldapp
=A0 File "/usr/share/meld/meld/meldapp.p= y", line 216, in <module>
=A0=A0=A0 app =3D MeldApp()
=A0 File "/usr/share/meld/meld/meldapp.= py", line 113, in __init__
=A0=A0=A0 self.prefs =3D preferences.Mel= dPreferences()
=A0 File "/usr/share/meld/meld/preferences.py",= line 259, in __init__
=A0=A0=A0 super(MeldPreferences, self).__init__("/apps/meld", sel= f.defaults)
=A0 File "/usr/share/meld/meld/util/prefs.py", lin= e 93, in __init__
=A0=A0=A0 self._gconf.add_dir(rootkey, gconf.CLIENT_PR= ELOAD_NONE)
glib.GError: No D-BUS daemon running

Any chance of making meld simpl= y disable dbus support when dbus is unavailable?

- GIlboa

--14dae9340e3b16f69104d80398e0-- From kai.willadsen@gmail.com Sat Mar 16 20:07:58 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 9407D76DFE for ; Sat, 16 Mar 2013 20:07:58 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 93u1u49PQ6oI for ; Sat, 16 Mar 2013 20:07:47 +0000 (UTC) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by restaurant.gnome.org (Postfix) with ESMTP id AE93B762F0 for ; Sat, 16 Mar 2013 20:07:46 +0000 (UTC) Received: by mail-lb0-f182.google.com with SMTP id gj3so232680lbb.27 for ; Sat, 16 Mar 2013 13:07:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=77SriLPH0QQhdZf3dyiZqR5dt9MM88PSi4LdI5sCC+U=; b=xNDRXqa2JDbKPdHz6pnQznHChbD87wfcve8A286pGvy8XQmIYhArGbPGe6wPPcQ4ue JrhOHhGKo5EsnhbilVzoLm6sPbCMXjs6GKjljN4px9VG2C4JId5u3sVr4tsg6UzQJc4x bZmlddCFiflpOR2EzUrpI2Du4IVz6dwtBzdvrSaI26DW6r75thO5TgiycvRo0+7+czB7 kuDYhjORchLV5wSRNMgrE0QyVRcNm6e6k2E4p60wNq6qFyrPyNubSUatMhi+dhN6dkPR PLnC2ZQo93YeXxdzasjF+SlXTGW6Jc1dP56IAIbGv2gtAN5MJFi17/HVg/p2ON7nxGdt p76A== MIME-Version: 1.0 X-Received: by 10.152.132.170 with SMTP id ov10mr9621151lab.21.1363464464373; Sat, 16 Mar 2013 13:07:44 -0700 (PDT) Received: by 10.114.25.33 with HTTP; Sat, 16 Mar 2013 13:07:44 -0700 (PDT) In-Reply-To: References: Date: Sun, 17 Mar 2013 06:07:44 +1000 Message-ID: Subject: Re: Support for DBUS-less mode. From: Kai Willadsen To: Gilboa Davara Content-Type: text/plain; charset=UTF-8 Cc: Users/Devel Meld X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 20:07:58 -0000 On 16 March 2013 14:57, Gilboa Davara wrote: > Hello, > > When trying to used meld to compare files as root, I'm getting exceptions > due to meld being unable to connect to DBUS (access denied). > > (meld:29000): GConf-WARNING **: Client failed to connect to the D-BUS > daemon: > Did not receive a reply. Possible causes include: the remote application did > not send a reply, the message bus security policy blocked the reply, the > reply timeout expired, or the network connection was broken. > Traceback (most recent call last): > File "/usr/bin/meld", line 154, in > main() > File "/usr/bin/meld", line 136, in main > import meld.meldapp > File "/usr/share/meld/meld/meldapp.py", line 216, in > app = MeldApp() > File "/usr/share/meld/meld/meldapp.py", line 113, in __init__ > self.prefs = preferences.MeldPreferences() > File "/usr/share/meld/meld/preferences.py", line 259, in __init__ > super(MeldPreferences, self).__init__("/apps/meld", self.defaults) > File "/usr/share/meld/meld/util/prefs.py", line 93, in __init__ > self._gconf.add_dir(rootkey, gconf.CLIENT_PRELOAD_NONE) > glib.GError: No D-BUS daemon running > > Any chance of making meld simply disable dbus support when dbus is > unavailable? This is actually gconf, not Meld. Meld *also* has dbus support, but that should fail gracefully if we can't connect. We also have a fallback for gconf support, but right now it only works if you don't have gconf installed; if it's installed but can't connect, then it blows up as above. It probably wouldn't be too hard to make that fallback depend on actual gconf viability rather than presence, but I haven't really looked into it. cheers, Kai From gilboad@gmail.com Sun Mar 17 10:12:09 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 6A10276E13 for ; Sun, 17 Mar 2013 10:12:09 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.698 X-Spam-Level: X-Spam-Status: No, score=-2.698 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jm0Z6uUUhlau for ; Sun, 17 Mar 2013 10:12:08 +0000 (UTC) Received: from mail-ia0-f172.google.com (mail-ia0-f172.google.com [209.85.210.172]) by restaurant.gnome.org (Postfix) with ESMTP id BF43376DFE for ; Sun, 17 Mar 2013 10:12:08 +0000 (UTC) Received: by mail-ia0-f172.google.com with SMTP id l29so4500805iag.3 for ; Sun, 17 Mar 2013 03:12:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=ri4B72Zceny4k4T+WYBGYwN2hgcC1khJPkd7eIgq348=; b=g9hku9niLX0nn03mu/Ke6OpJDWCEk4rMKM/tRPyTNKhJ5CXhH4rt9fWvbcRHgTBgHd oEklGrgb9cmBd8cj/J9Apz3oqjckY8sqwt+wGokg4Oyb0WK4U95+nq0S1FOa/A40XElq iaGSr2hYpoHQu5DdIfY/ulrcxSvYOho/cZb/hUhJUOOGvSZ7tT0xIFEyiD8EN47c+V5h U1oNmRLuLI6wIBeMXJWi69gTy3llEkDqJorQN48FJDRB14ys2g8h2LZ9xKMwxZVTQjZB MW5w7sJrxxffCTs4LdTu86z1ZqxFjwathAmPDoA/cIn0SYJTfFKEpEVsgLqcrSsQVyDb h49w== MIME-Version: 1.0 X-Received: by 10.50.190.164 with SMTP id gr4mr4363248igc.19.1363515126911; Sun, 17 Mar 2013 03:12:06 -0700 (PDT) Received: by 10.64.7.99 with HTTP; Sun, 17 Mar 2013 03:12:06 -0700 (PDT) In-Reply-To: References:

Date: Sun, 17 Mar 2013 12:12:06 +0200 Message-ID: Subject: Re: Support for DBUS-less mode. From: Gilboa Davara To: Kai Willadsen Content-Type: multipart/alternative; boundary=f46d04478517c91ac304d81c1a4a Cc: Users/Devel Meld X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Mar 2013 10:12:09 -0000 --f46d04478517c91ac304d81c1a4a Content-Type: text/plain; charset=ISO-8859-1 On Sat, Mar 16, 2013 at 10:07 PM, Kai Willadsen wrote: > On 16 March 2013 14:57, Gilboa Davara wrote: > > Hello, > > > > When trying to used meld to compare files as root, I'm getting exceptions > > due to meld being unable to connect to DBUS (access denied). > > > > (meld:29000): GConf-WARNING **: Client failed to connect to the D-BUS > > daemon: > > Did not receive a reply. Possible causes include: the remote application > did > > not send a reply, the message bus security policy blocked the reply, the > > reply timeout expired, or the network connection was broken. > > Traceback (most recent call last): > > File "/usr/bin/meld", line 154, in > > main() > > File "/usr/bin/meld", line 136, in main > > import meld.meldapp > > File "/usr/share/meld/meld/meldapp.py", line 216, in > > app = MeldApp() > > File "/usr/share/meld/meld/meldapp.py", line 113, in __init__ > > self.prefs = preferences.MeldPreferences() > > File "/usr/share/meld/meld/preferences.py", line 259, in __init__ > > super(MeldPreferences, self).__init__("/apps/meld", self.defaults) > > File "/usr/share/meld/meld/util/prefs.py", line 93, in __init__ > > self._gconf.add_dir(rootkey, gconf.CLIENT_PRELOAD_NONE) > > glib.GError: No D-BUS daemon running > > > > Any chance of making meld simply disable dbus support when dbus is > > unavailable? > > This is actually gconf, not Meld. Meld *also* has dbus support, but > that should fail gracefully if we can't connect. We also have a > fallback for gconf support, but right now it only works if you don't > have gconf installed; if it's installed but can't connect, then it > blows up as above. > > It probably wouldn't be too hard to make that fallback depend on > actual gconf viability rather than presence, but I haven't really > looked into it. > > cheers, > Kai > OK, thanks. You want me to open a BZ? - Gilboa --f46d04478517c91ac304d81c1a4a Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable

On S= at, Mar 16, 2013 at 10:07 PM, Kai Willadsen <kai.willadsen@gmail.c= om> wrote:

On 1= 6 March 2013 14:57, Gilboa Dava= ra <gilboad@gmail.com> wrote= :
> Hello,
>
> When trying to used meld to compare files as root, I'm getting exc= eptions
> due to meld being unable to connect to DBUS (access denied).
>
> (meld:29000): GConf-WARNING **: Client failed to connect to the D-BUS<= br> > daemon:
> Did not receive a reply. Possible causes include: the remote applicati= on did
> not send a reply, the message bus security policy blocked the reply, t= he
> reply timeout expired, or the network connection was broken.
> Traceback (most recent call last):
> =A0 File "/usr/bin/meld", line 154, in <module>
> =A0 =A0 main()
> =A0 File "/usr/bin/meld", line 136, in main
> =A0 =A0 import meld.meldapp
> =A0 File "/usr/share/meld/meld/meldapp.py", line 216, in <= ;module>
> =A0 =A0 app =3D MeldApp()
> =A0 File "/usr/share/meld/meld/meldapp.py", line 113, in __i= nit__
> =A0 =A0 self.prefs =3D preferences.MeldPreferences()
> =A0 File "/usr/share/meld/meld/preferences.py", line 259, in= __init__
> =A0 =A0 super(MeldPreferences, self).__init__("/apps/meld", = self.defaults)
> =A0 File "/usr/share/meld/meld/util/prefs.py", line 93, in _= _init__
> =A0 =A0 self._gconf.add_dir(rootkey, gconf.CLIENT_PRELOAD_NONE)
> glib.GError: No D-BUS daemon running
>
> Any chance of making meld simply disable dbus support when dbus is
> unavailable?

This is actually gconf, not Meld. Meld *also* has dbus support,= but
that should fail gracefully if we can't connect. We also have a
fallback for gconf support, but right now it only works if you don't have gconf installed; if it's installed but can't connect, then it<= br> blows up as above.

It probably wouldn't be too hard to make that fallback depend on
actual gconf viability rather than presence, but I haven't really
looked into it.

cheers,

Kai

OK= , thanks.
You want me to open a BZ?

- Gilboa

--f46d04478517c91ac304d81c1a4a-- From sveinse@seldal.com Mon Mar 18 10:18:05 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 422A976E9D for ; Mon, 18 Mar 2013 10:18:05 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AadHyC5oRA9S for ; Mon, 18 Mar 2013 10:18:04 +0000 (UTC) Received: from smtp.domeneshop.no (smtp.domeneshop.no [194.63.252.54]) by restaurant.gnome.org (Postfix) with ESMTP id 6706176DFC for ; Mon, 18 Mar 2013 10:18:03 +0000 (UTC) Received: from [79.160.140.131] (port=1483 helo=[128.1.101.181]) by smtp.domeneshop.no with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1UHX8j-00023D-AT; Mon, 18 Mar 2013 11:18:01 +0100 Message-ID: <5146E9D8.2030204@seldal.com> Date: Mon, 18 Mar 2013 11:18:00 +0100 From: Svein Seldal User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Kai Willadsen Subject: Re: Use meld to diff a list of files References: <51430B3B.8070804@seldal.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: meld-list X-BeenThere: meld-list@gnome.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Discussion about the Meld visual diff and merge tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Mar 2013 10:18:05 -0000 On 03/15/2013 09:20 PM, Kai Willadsen wrote: > I think you want the --diff command line argument, which launches a > tab for a two or three-way comparison. You can give Meld this argument > as many times as you like, and all of the comparisons will be launched > in tabs in a single window. I just tried it with --diff, but it generates too many tabs for any reasonable sized list. What I'd like to have is a directory view with the list I provide meld, and let the user pick the files to view diff on. This list is coming from python already, so I can access the meld classes directly if I have to. The reason I do this is because I need a tool for comparing root file systems. Meld is perfect for visualising the differences, but it has some features which spoils my usage. Meld seems to follow symlinks, which pollutes melds output and it might end up comparing the wrong file (e.g. a symlink pointing out of the file system). I know you can disable symlinks alltogether, but that isn't what I need either. And then you have special files (blk, chr, fifo and sockets). I understand that this functionality is outside meld's scope, so I wrote my own directory diff program in Py. It compares two directory trees and it compares the metadata of files, e.g. link content/data instead of following the link, blk/chr dev major/minor compare. For ordinary files it just compares sizes and sha1 hashsums. If not equal I'd like to display the diff in meld. Best regards, Svein Seldal From pedro.pedruzzi@gmail.com Mon Mar 18 17:57:21 2013 Return-Path: X-Original-To: meld-list@gnome.org Delivered-To: meld-list@gnome.org Received: from localhost (localhost.localdomain [127.0.0.1]) by restaurant.gnome.org (Postfix) with ESMTP id 116C076ADF for ; Mon, 18 Mar 2013 17:57:21 +0000 (UTC) X-Virus-Scanned: by amavisd-new at gnome.org X-Spam-Flag: NO X-Spam-Score: -2.699 X-Spam-Level: X-Spam-Status: No, score=-2.699 tagged_above=-999 required=2 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham Received: from restaurant.gnome.org ([127.0.0.1]) by localhost (restaurant.gnome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pXDpjDGqCMqs for ; Mon, 18 Mar 2013 17:57:07 +0000 (UTC) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by restaurant.gnome.org (Postfix) with ESMTP id 2587976B20 for ; Mon, 18 Mar 2013 17:57:06 +0000 (UTC) Received: by mail-wg0-f49.google.com with SMTP id ds1so4143281wgb.28 for