From users-return-21022-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Fri Mar 7 18:05:53 2014 Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8AC0E1021D for ; Fri, 7 Mar 2014 18:05:53 +0000 (UTC) Received: (qmail 92874 invoked by uid 500); 7 Mar 2014 18:05:52 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 92001 invoked by uid 500); 7 Mar 2014 18:05:51 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 90962 invoked by uid 99); 7 Mar 2014 18:05:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Mar 2014 18:05:45 +0000 X-ASF-Spam-Status: No, hits=-0.1 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of acontardo@meditech.com designates 74.125.149.73 as permitted sender) Received: from [74.125.149.73] (HELO na3sys009aog104.obsmtp.com) (74.125.149.73) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Mar 2014 18:05:41 +0000 Received: from mail-pa0-f45.google.com ([209.85.220.45]) (using TLSv1) by na3sys009aob104.postini.com ([74.125.148.12]) with SMTP ID DSNKUxoKX7/etqjUPQTayAIkazpY/ahZCixc@postini.com; Fri, 07 Mar 2014 10:05:20 PST Received: by mail-pa0-f45.google.com with SMTP id kl14so4481241pab.4 for ; Fri, 07 Mar 2014 10:05:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=ycrwkXnig1zLdPaCcWIk6Gy2Ac/Tw26XmmmkfWLt42g=; b=nAN4SuiCA68AoxRXb4+uzrGFw2J6enbCkg18LkFW4jMth1tUPBnv3lHe4Hdl+UEZNn Gg1HORBkd6I6royWYu59QVFAPStybJ+Ix2dVVh91jdddIgUP2/QRychaOWIuGTgWr0IJ GOQL9pLeX0TjqhLzO4fzLfzD/yuhVqlrz+LMYj8gNLq/MYl/WN1LP96LFszSVfabKEB8 XUL9A0d5tQr1NuER+IPIR1SW3Zqj758YknP5JVk9RsonZXLN6rqAaY3hh9jTnu+T8RQw VSnFtLtZSHpKUYIJG93gpvwc/Y61HGxGMUhOqww1kciUVg0MO4SjwjlirICqV2vZHNbj iemA== X-Gm-Message-State: ALoCoQk9uqd7fZH/I0qCIhMplP3z5zxfHQxFqdbsrZdVbu8h1MDbB4We1gmaXqEulQoWFvaJHZaPZBKNqRbFKu2VF/WjwBSve3rQ27dajoXkZ/4QaLeQmtC2P+N3vpj7lN8Rl08vbF3qx9ZdNrUL8nkF/F3CxEcXCvGfc9D6DE5HLt4Pm1CvxQs= X-Received: by 10.66.181.70 with SMTP id du6mr23119844pac.23.1394215519234; Fri, 07 Mar 2014 10:05:19 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.66.181.70 with SMTP id du6mr23119820pac.23.1394215519025; Fri, 07 Mar 2014 10:05:19 -0800 (PST) Received: by 10.68.88.130 with HTTP; Fri, 7 Mar 2014 10:05:18 -0800 (PST) In-Reply-To: References: <04f401cf3944$15ad6c00$41084400$@qqmail.nl> Date: Fri, 7 Mar 2014 13:05:18 -0500 Message-ID: Subject: Re: [SVN Users] SVN Status Command Line in 1.8 vs 1.7 From: Adam Contardo To: Forest Handford Cc: Bert Huijben , Matt McCullough , "users@subversion.apache.org" , "David T. Murphy" Content-Type: multipart/alternative; boundary=047d7bd6b828c0950a04f408186d X-Virus-Checked: Checked by ClamAV on apache.org --047d7bd6b828c0950a04f408186d Content-Type: text/plain; charset=ISO-8859-1 Sweet, thanks Bert. This will certainly save us a substantial amount of time and energy. On Fri, Mar 7, 2014 at 8:51 AM, Forest Handford wrote: > Thank you Bert! > > > On Thu, Mar 6, 2014 at 8:57 AM, Bert Huijben wrote: > >> 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> wrote: >> >> Perhaps use the --XML arg? >> >> >> >> On Wednesday, March 5, 2014, Forest Handford >> 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=markupin 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 >> 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. >> 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. >> 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 >> > > > > -- > Forest Handford, Supervisor Development, 781-774-5148 > Medical Information Technology, Inc. > Mailstop: S4W186W, MEDITECH Circle, Westwood, MA 02090 > -- Adam Contardo, Programmer Development, 781-774-5161 Medical Information Technology, Inc. Mailstop: F3N244, MEDITECH Circle, Westwood, MA 02090 --047d7bd6b828c0950a04f408186d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Sweet, thanks Bert. =A0This will certainly save us a subst= antial amount of time and energy.


<= div class=3D"gmail_quote">On Fri, Mar 7, 2014 at 8:51 AM, Forest Handford <= span dir=3D"ltr"><fhandford@meditech.com> wrote:
Thank you Bert!


On Thu, Mar 6, 2014 at 8:57 AM, Bert Huijben <bert@qqmail.nl> = wrote:

T= he relevant change was in revision r1428637

=A0=

[[

----------= --------------------------------------------------------------

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

=A0=

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

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

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

blank colu= mns were visible but not used.

=A0

* subversi= on/svn/status.c

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

=A0=

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

=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=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

--- subver= sion/trunk/subversion/svn/status.c=A0 (revision 1428636)

+++ subver= sion/trunk/subversion/svn/status.c=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 (= revision 1428637)

@@ -377,7 = +377,7 @@ print_status(const char *cwd_abspath, const char *<= /span>

=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0SVN_ERR

=A0=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0 (svn_cmdline_printf(pool,<= /p>

-=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0=A0=A0 "%c%c%c%c%c%c%c %c=A0=A0 %6s=A0=A0 %6s %-12s %s%s%s%s\n&q= uot;,

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

=A0=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0=A0=A0generate_status_code(combined_status(status)),

=A0=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0=A0=A0 generate_status_code(prop_status),

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

@@ -396,7 = +396,7 @@ print_status(const char *cwd_abspath, const char *<= /span>

=A0=A0=A0= =A0=A0=A0=A0=A0 }

=A0=A0=A0=A0=A0=A0 else

=A0=A0=A0= =A0=A0=A0=A0=A0 SVN_ERR(

-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 svn_= cmdline_printf(pool, "%c%c%c%c%c%c%c %c=A0=A0 %6s=A0=A0 %s%s%s%s\n&quo= t;,

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

=A0=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0 generate_status_code(combined_status(status)),<= /p>

=A0=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0 generate_status_code(prop_status),

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

=A0=

-------------------------------------------------------------------= -----

]]<= u>

=A0

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

=A0=

=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 Bert

=A0

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

=A0<= u>

Matt,

=A0

=A0 =A0 That's an interesting proposal. =A0Do you know if ther= e are any pre-existing tools in M-AT that could parse up an XML file for us= . =A0

=A0

=A0 =A0 Also, is the extra space character there as a place holder = for a piece of data that is depreciated in 1.8+. =A0For example the 8 space= s (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 ar= e newer revisions on the server, etc? =A0I'm just curious if that space= char represented a piece of data that is no longer relevant in 1.8<= u>

<= /u>=A0

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

= Perhaps use the --XML arg?



On Wednesday, March 5, 2014, Forest Handford <fhandford@meditech.com> wr= ote:

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

=A0

M =A0 =A0 =A0 =A0 =A0 1167395 =A0 1164911 FHANDFORD =A0 =A0C:\ProgramDa= ta\Meditech\MTCM.Universe\MTCM.DEVF.Ring\!AllUsers\Sys\PgmCache\Ring\PgmSou= rce\Foc\FocZ.Subversion.C.focus

=A0

In 1.8 I get:

=A0

M =A0 =A0 =A0 =A0 = =A01167395 =A01164911 FHANDFORD =A0 =A0FocZ.Subversion.C.focus

=A0

C:\ProgramData\MEDITECH\MTCM.Universe\MTCM.DEVF.Ring\!AllUsers\Sys\PgmCac= he\Ring


Notice how in 1.8 wor= king_rev is one character further left. =A0I took a peak at http://svn.apache.org/viewvc/subversion/trunk/subve= rsion/svn/status.c?view=3Dmarkup in various revisions since march 2013.= =A0The svn_cmdline_printf() call in print_status() appears to be consisten= t. =A0working_rev also seems to be consistently set using=A0apr_psprintf(po= ol, "%ld", status->revision). We can parse it correctly with e= ither position, but worry that the position may arbitrarily change in the f= uture causing future parsing to fail. As an example, if it moved yet anothe= r space to the left, we would lose the left most digit. Any ideas?

=A0

Thanks,

Forest --=A0

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

--
You received this message because you are subscribed to the Goo= gle Groups "SVN Users" group.
To unsubscribe from this group and stop receiving emails from it, send an e= mail to svn-users-group+unsubscribe@meditech.com.
Visit this gro= up at http://groups.google.com/a/meditech.com/group/svn-u= sers-group/.

--
You received this message becaus= e you are subscribed to the Google Groups "SVN Users" group.
T= o unsubscribe from this group and stop receiving emails from it, send an em= ail to svn-users-group+unsubscribe@meditech.com.
Visit this group at http://groups.google.com/a/meditech.c= om/group/svn-users-group/.



=A0

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




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



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