You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ne...@apache.org on 2010/02/12 15:12:44 UTC
svn commit: r909419 - in /subversion/trunk: Makefile.in
subversion/libsvn_diff/diff_file.c subversion/libsvn_diff/lcs.c
subversion/svn/info-cmd.c
Author: neels
Date: Fri Feb 12 14:12:43 2010
New Revision: 909419
URL: http://svn.apache.org/viewvc?rev=909419&view=rev
Log:
Cosmetic.
* Makefile.in (revision-install): Line up the line breaking backslashes.
* subversion/libsvn_diff/diff_file.c
(datasource_get_next_token):
Equivalently "reverse" a condition, IMHO easier to understand like this.
Add a comment. Change one pre-op '++' to post-op, because it makes
no difference here and post-op is used just above.
* subversion/libsvn_diff/lcs.c:
Comment: add a reference to acronym LCS next to its long name to ease the
life of developers that turn to grep -i in search for meaning.
* subversion/svn/info-cmd.c
(print_info):
Put three var declarations on their own line each, add two blank lines
for readability.
Modified:
subversion/trunk/Makefile.in
subversion/trunk/subversion/libsvn_diff/diff_file.c
subversion/trunk/subversion/libsvn_diff/lcs.c
subversion/trunk/subversion/svn/info-cmd.c
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=909419&r1=909418&r2=909419&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Fri Feb 12 14:12:43 2010
@@ -411,14 +411,14 @@
### HACK!! Find a better way to do this
revision-install:
subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$$?" != "0"; then \
+ $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
+ if test "$$?" != "0"; then \
svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$$?" != "0"; then \
- echo "unknown" > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- fi; \
+ $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
+ if test "$$?" != "0"; then \
+ echo "unknown" > \
+ $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
+ fi; \
fi;
install-static: @INSTALL_STATIC_RULES@
Modified: subversion/trunk/subversion/libsvn_diff/diff_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff_file.c?rev=909419&r1=909418&r2=909419&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff_file.c (original)
+++ subversion/trunk/subversion/libsvn_diff/diff_file.c Fri Feb 12 14:12:43 2010
@@ -302,10 +302,11 @@
had_cr = (*eol == '\r');
eol++;
/* If we have the whole eol sequence in the chunk... */
- if (!had_cr || eol != endp)
+ if (!(had_cr && eol == endp))
{
+ /* Also skip past the '\n' in an '\r\n' sequence. */
if (had_cr && *eol == '\n')
- ++eol;
+ eol++;
break;
}
}
Modified: subversion/trunk/subversion/libsvn_diff/lcs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/lcs.c?rev=909419&r1=909418&r2=909419&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/lcs.c (original)
+++ subversion/trunk/subversion/libsvn_diff/lcs.c Fri Feb 12 14:12:43 2010
@@ -30,7 +30,7 @@
/*
- * Calculate the Longest Common Subsequence between two datasources.
+ * Calculate the Longest Common Subsequence (LCS) between two datasources.
* This function is what makes the diff code tick.
*
* The LCS algorithm implemented here is described by Sun Wu,
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=909419&r1=909418&r2=909419&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Fri Feb 12 14:12:43 2010
@@ -428,13 +428,17 @@
if (info->tree_conflict)
{
- const char *desc, *src_left_version, *src_right_version;
+ const char *desc;
+ const char *src_left_version;
+ const char *src_right_version;
SVN_ERR(svn_cl__get_human_readable_tree_conflict_description(
&desc, info->tree_conflict, pool));
+
src_left_version =
svn_cl__node_description(info->tree_conflict->src_left_version,
info->repos_root_URL, pool);
+
src_right_version =
svn_cl__node_description(info->tree_conflict->src_right_version,
info->repos_root_URL, pool);