Bug 86779 - scm.add() doesn't work properly with svn 1.7
Summary: scm.add() doesn't work properly with svn 1.7
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Dirk Pranke
URL:
Keywords:
Depends on: 86801
Blocks:
  Show dependency treegraph
 
Reported: 2012-05-17 15:05 PDT by Dirk Pranke
Modified: 2012-05-18 15:22 PDT (History)
6 users (show)

See Also:


Attachments
Patch (2.48 KB, patch)
2012-05-17 16:46 PDT, Dirk Pranke
no flags Details | Formatted Diff | Diff
add shortcut for svn < 1.7 (2.67 KB, patch)
2012-05-17 17:45 PDT, Dirk Pranke
no flags Details | Formatted Diff | Diff
Patch (2.89 KB, patch)
2012-05-18 15:03 PDT, Dirk Pranke
eric: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dirk Pranke 2012-05-17 15:05:34 PDT
in order to determine if the directory of a file being added is already under version control, the code looks for a ".svn" in the directory alongside the file. SVN 1.7 no longer uses ".svn" in every directory, so the check fails, the code starts crawling upwards, and ends up trying to do things it shouldn't.
Comment 1 Adam Barth 2012-05-17 15:17:18 PDT
What's the right way of doing this check?  We could run "svn info"...
Comment 2 Dirk Pranke 2012-05-17 15:18:22 PDT
that might be it. I am attempting to repro/fix it right now (suppose I might as well assign this to me, then :).
Comment 3 Peter Kasting 2012-05-17 15:18:32 PDT
Yep, AFAIK "svn info" is the right way to go, and is backwards-compatible.  Too bad it's a lot slower.  However, I think it can get you to the root in one shot instead of needing to recurse.
Comment 4 Dirk Pranke 2012-05-17 16:46:29 PDT
Created attachment 142586 [details]
Patch
Comment 5 Tony Chang 2012-05-17 16:55:38 PDT
Comment on attachment 142586 [details]
Patch

Could we check for .svn and if it doesn't exist, run svn info?  That would optimize for the common case until svn 1.7 usage grows.
Comment 6 Dirk Pranke 2012-05-17 17:40:55 PDT
(In reply to comment #5)
> (From update of attachment 142586 [details])
> Could we check for .svn and if it doesn't exist, run svn info?  That would optimize for the common case until svn 1.7 usage grows.

Sure. It's not clear to me that 'svn info' is particularly slow - I think it's a local call - but that's a simple enough optimization.
Comment 7 Dirk Pranke 2012-05-17 17:45:51 PDT
Created attachment 142595 [details]
add shortcut for svn < 1.7
Comment 8 Dirk Pranke 2012-05-17 19:04:27 PDT
Committed r117526: <http://trac.webkit.org/changeset/117526>
Comment 9 WebKit Review Bot 2012-05-17 20:10:56 PDT
Re-opened since this is blocked by 86801
Comment 10 Peter Kasting 2012-05-17 20:18:15 PDT
Rolled out ( :( ) because the Chromium Mac 10.5 layout test canaries broke.  Here's a sample output:

http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Mac10.5/builds/11591/steps/webkit_lint/logs/stdio
Comment 11 Ryosuke Niwa 2012-05-18 12:11:19 PDT
Comment on attachment 142595 [details]
add shortcut for svn < 1.7

Clearing ? from the patch that had been landed and rolled out.
Comment 12 Dirk Pranke 2012-05-18 15:03:23 PDT
Created attachment 142794 [details]
Patch
Comment 13 Eric Seidel (no email) 2012-05-18 15:07:36 PDT
Comment on attachment 142794 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=142794&action=review

OK.

> Tools/ChangeLog:9
> +        Re-land the change in r117526 with a fix to maintain
> +        compatibility with SVN 1.4.4 (yay Leopard!); turns out

Really?  Leopard be damned, no?
Comment 14 Dirk Pranke 2012-05-18 15:11:27 PDT
(In reply to comment #13)
> > Tools/ChangeLog:9
> > +        Re-land the change in r117526 with a fix to maintain
> > +        compatibility with SVN 1.4.4 (yay Leopard!); turns out
> 
> Really?  Leopard be damned, no?

Chromium still has Leopard bots.
Comment 15 Dirk Pranke 2012-05-18 15:21:53 PDT
Committed r117643: <http://trac.webkit.org/changeset/117643>
Comment 16 Ojan Vafai 2012-05-18 15:22:49 PDT
(In reply to comment #14)
> (In reply to comment #13)
> > > Tools/ChangeLog:9
> > > +        Re-land the change in r117526 with a fix to maintain
> > > +        compatibility with SVN 1.4.4 (yay Leopard!); turns out
> > 
> > Really?  Leopard be damned, no?
> 
> Chromium still has Leopard bots.

Current plan is to kill them sometime this Summer.