revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-22 14:52:40 +01:00
Code Issues Releases Wiki Activity

Fix issue with svn-hook-pre-commit when resolving .arcconfig for nested

Browse source 
directories

Summary:
If you had changes to a directory covered by a .arcconfig residing
inside another directory also covered by an .arcconfig, the hook would
incorrectly attribute the first file it attempted to resolve to the topmost
.arcconfig because it failed to break out of the loop after resolving it.

All other files would be correctly attributed, because they'd hit the cache.

Test Plan:
Created an svn repository and checked it out locally. Created a
structure like this:

  .arcconfig
  shallow
  a/
   b/
    c/
     .arcconfig
     d/
      deep
      deep2
      deep3

Made modifications to "deep", "deep2", and "deep3". Received an error message
about multiple .arcconfig changes, attributing one file to the topmost
arcconfig and the other two to the deeper one.

Applied patch.

Commit now goes through. Made a commit affecting 'shallow' and 'deep' and
'deep2', commit was correctly blocked and files were attributed to the
corresponding .arcconfigs.

Reviewed By: mroch
Reviewers: mroch
CC: mroch
Differential Revision: 50
This commit is contained in:
epriestley 2011-03-05 00:42:46 -08:00
parent 0a0aa6d718
commit 61e16d9cc3
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/workflow/svn-hook-pre-commit/ArcanistSvnHookPreCommitWorkflow.php
View file

@ -114,6 +114,7 @@ EOTEXT
} else { } else {
$resolved[$path] = $config ? $config.'/.arcconfig' : '.arcconfig'; $resolved[$path] = $config ? $config.'/.arcconfig' : '.arcconfig';
$found[$config] = $resolved[$path]; $found[$config] = $resolved[$path];
break;
} }
$config = dirname($config); $config = dirname($config);
if ($config == '.') { if ($config == '.') {