subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bert Huijben" <b...@qqmail.nl>
Subject RE: [SVN Users] SVN Status Command Line in 1.8 vs 1.7
Date Thu, 06 Mar 2014 13:57:55 GMT
The relevant change was in revision r1428637

 

[[

------------------------------------------------------------------------

r1428637 | julianfoad | 2013-01-03 23:13:26 +0100 (do, 03 jan 2013) | 7
lines

 

Maintain vertical alignment of 'svn status' output with up to 8-digit

revision numbers being shown, when '-v' and/or '-u' options are used.

Previously the output would only remain aligned up to 6 digits; two spare

blank columns were visible but not used.

 

* subversion/svn/status.c

  (print_status): Allow revision numbers to use all of the existing space.

 

Index: subversion/trunk/subversion/svn/status.c

===================================================================

--- subversion/trunk/subversion/svn/status.c  (revision 1428636)

+++ subversion/trunk/subversion/svn/status.c              (revision 1428637)

@@ -377,7 +377,7 @@ print_status(const char *cwd_abspath, const char *

           SVN_ERR

             (svn_cmdline_printf(pool,

-                                "%c%c%c%c%c%c%c %c   %6s   %6s %-12s
%s%s%s%s\n",

+                                "%c%c%c%c%c%c%c %c %8s %8s %-12s
%s%s%s%s\n",

 
generate_status_code(combined_status(status)),

                                 generate_status_code(prop_status),

                                 status->wc_is_locked ? 'L' : ' ',

@@ -396,7 +396,7 @@ print_status(const char *cwd_abspath, const char *

         }

       else

         SVN_ERR(

-           svn_cmdline_printf(pool, "%c%c%c%c%c%c%c %c   %6s   %s%s%s%s\n",

+           svn_cmdline_printf(pool, "%c%c%c%c%c%c%c %c %8s   %s%s%s%s\n",

 
generate_status_code(combined_status(status)),

                               generate_status_code(prop_status),

                               status->wc_is_locked ? 'L' : ' ',

 

------------------------------------------------------------------------

]]

 

If I read this correctly this should only change the output for revision
numbers over 6 digits. (Of course the --xml recommendation still stands)

 

                Bert

 

From: Adam Contardo [mailto:acontardo@meditech.com] 
Sent: woensdag 5 maart 2014 23:06
To: Matt McCullough
Cc: Forest Handford; users@subversion.apache.org; David T. Murphy; SVN Users
Subject: Re: [SVN Users] SVN Status Command Line in 1.8 vs 1.7

 

Matt,

 

    That's an interesting proposal.  Do you know if there are any
pre-existing tools in M-AT that could parse up an XML file for us.  

 

    Also, is the extra space character there as a place holder for a piece
of data that is depreciated in 1.8+.  For example the 8 spaces (or is it 9?)
between the M and the revision number are a set of flags (1 char per flag)
representing things like lock info, whether or not there are newer revisions
on the server, etc?  I'm just curious if that space char represented a piece
of data that is no longer relevant in 1.8

 

On Wed, Mar 5, 2014 at 9:52 AM, Matt McCullough
<matt_mccullough@meditech.com <mailto:matt_mccullough@meditech.com> > wrote:

Perhaps use the --XML arg?



On Wednesday, March 5, 2014, Forest Handford <fhandford@meditech.com
<mailto:fhandford@meditech.com> > wrote:

A colleague of mine and I discovered that the location of the working
revision (working_rev) in 1.8.3 is different from 1.7.12 .  We are both
using svn.exe from the TortoiseSVN package on Windows.  In 1.7 he gets the
following:

 

M           1167395   1164911 FHANDFORD
C:\ProgramData\Meditech\MTCM.Universe\MTCM.DEVF.Ring\!AllUsers\Sys\PgmCache\
Ring\PgmSource\Foc\FocZ.Subversion.C.focus

 

In 1.8 I get:

 

M          1167395  1164911 FHANDFORD    FocZ.Subversion.C.focus

 

C:\ProgramData\MEDITECH\MTCM.Universe\MTCM.DEVF.Ring\!AllUsers\Sys\PgmCache\
Ring


Notice how in 1.8 working_rev is one character further left.  I took a peak
at
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?view=m
arkup in various revisions since march 2013.  The svn_cmdline_printf() call
in print_status() appears to be consistent.  working_rev also seems to be
consistently set using apr_psprintf(pool, "%ld", status->revision). We can
parse it correctly with either position, but worry that the position may
arbitrarily change in the future causing future parsing to fail. As an
example, if it moved yet another space to the left, we would lose the left
most digit. Any ideas?

 

Thanks,

Forest
-- 

Forest Handford, Supervisor Development, 781-774-5148 <tel:781-774-5148> 
Medical Information Technology, Inc.
Mailstop: S4W186W, MEDITECH Circle, Westwood, MA 02090 

-- 
You received this message because you are subscribed to the Google Groups
"SVN Users" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to svn-users-group+unsubscribe@meditech.com
<mailto:svn-users-group+unsubscribe@meditech.com> .
Visit this group at
http://groups.google.com/a/meditech.com/group/svn-users-group/.

-- 
You received this message because you are subscribed to the Google Groups
"SVN Users" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to svn-users-group+unsubscribe@meditech.com
<mailto:svn-users-group+unsubscribe@meditech.com> .
Visit this group at
http://groups.google.com/a/meditech.com/group/svn-users-group/.





 

-- 
Adam Contardo, Programmer Development, 781-774-5161
Medical Information Technology, Inc.
Mailstop: F3N244, MEDITECH Circle, Westwood, MA 02090 


Mime
View raw message