Re: diff/merge tool that ignores whitespace changes

[Matthew Caron]

On 08/28/2012 01:40 PM, Stephen Bash wrote:

- Original Message -

From: Enrico Weigelt enrico.weig...@vnc.biz
Sent: Tuesday, August 28, 2012 12:26:39 PM
Subject: diff/merge tool that ignores whitespace changes

I'm looking for a diff / merge tool that treats lines with
only whitespace changes (trailing or leading whitespaces,
linefeeds, etc) as equal.

The goal is to make reviews as well as merging or rebasing
easier when things like indentions often change.

Does anybody know an solution for that ?


I'm fond of Meld.

--
Matthew Caron, Software Build Engineer
Sixnet, a Red Lion business | www.sixnet.com
+1 (518) 877-5173 x138 office
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

I think git show is broken

[Matthew Caron]

(otherwise, there was a very strange change made to its functionality, 
which the documentation does not reflect)



Old, working git:

===
$ git --version
git version 1.7.0.4
$ git show --quiet --abbrev-commit --pretty=oneline 
47a7aee54553fb718c376cfa9d7de4389a391e33

47a7aee Fix hyperlinks for dependent tickets (#7139, #4976).
===

New, broken git:

===
$ git --version
git version 1.7.9.5

$ git show --quiet --abbrev-commit --pretty=oneline 
47a7aee54553fb718c376cfa9d7de4389a391e33

47a7aee Fix hyperlinks for dependent tickets (#7139, #4976).
diff --git a/mastertickets/web_ui.py b/mastertickets/web_ui.py
index a91b862..698ed98 100644
--- a/mastertickets/web_ui.py
+++ b/mastertickets/web_ui.py
@@ -32,7 +32,7 @@ class MasterTicketsModule(Component):
 use_gs = BoolOption('mastertickets', 'use_gs', default=False,
 doc='If enabled, use ghostscript to produce 
nicer output.')


-FIELD_XPATH = 
'div[@id=ticket]/table[@class=properties]/td[@headers=h_%s]/text()'
+FIELD_XPATH = 
'.//div[@id=ticket]/table[@class=properties]//td[@headers=h_%s]/text()'

 fields = set(['blocking', 'blockedby'])

 # IRequestFilter methods
===

It appears as though the new functionality always puts out a medium 
verbosity diff. Though the manpage says that it honors pretty=oneline, 
it does not seem to.


I searched around the message logs, etc. and would have expected this 
change to have thrown everyone else into as much upheaval as it has in 
my organization, and found nothing. Am I missing something?


Thanks in advance.
--
Matthew Caron, Software Build Engineer
Sixnet, a Red Lion business | www.sixnet.com
+1 (518) 877-5173 x138 office
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: I think git show is broken

[Matthew Caron]

On 08/28/2012 01:38 PM, Matthew Caron wrote:

(otherwise, there was a very strange change made to its functionality,
which the documentation does not reflect)


Never mind.

I was looking in the wrong spot. The issue is not with --pretty=oneline, 
it's with --quiet. In 1.7.0.4, --quiet worked like -s. It no longer does 
in 1.7.9.5. Switching to -s cures the problem.


--
Matthew Caron, Software Build Engineer
Sixnet, a Red Lion business | www.sixnet.com
+1 (518) 877-5173 x138 office
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html