A webrev patch to use 'trees' instead of 'forest'

Mike Duigou mike.duigou at oracle.com
Sat Mar 15 00:19:55 UTC 2014


Hi Daniel;

Since it looks like several people have tried your patch and seem to find it works for them then perhaps you should just create a CODETOOLS issue and propose it to this list (webrev-dev) for sponsorship.

I haven't had a chance to try it yet but likely wouldn't have anything to add by my review (and I am not a committer/reviewer on CODETOOLS) so I would encourage you to go ahead with proposing it yourself.

Cheers,

Mike
On Mar 13 2014, at 07:27 , Daniel Fuchs <daniel.fuchs at oracle.com> wrote:

> Hi,
> 
> [removed the jdk_confidential wider diffusion]
> 
> If that can help, attached is a patch that modifies webrev.ksh
> to use trees instead of forest.
> 
> The option remains the same - you still call webrev -f but it uses
> trees underneath.
> 
> Note that for this to work you need to have your forest configured
> for trees. An easy way to do that is to call:
> 
> hg tconfig --set --walk --depth
> 
> at the root of the forest.
> 
> Disclaimer:
> 1. I'm not an expert
> 2. I tested the patch only on my Mac, and only with the
>   following options:
> 
> [all files edited, no commit]:
> 
> webrev -fN
> 
> [all files committed, no edits]:
> 
> webrev -f
> 
> The main changes (trickiest) comes from the fact that whereas
> hg f<cmd> used to print '[<relative-path>]' hg t<cmd> now
> prints '[<full-path>]:'
> 
> Hope this helps,
> 
> -- daniel
> 
> 
> 
> On 3/13/14 7:16 AM, Mike Duigou wrote:
>> You will have to remove the "-f" option. If you need to generate cross-repo webrevs then you'll need to create a filelist of the files and pass that to webrev. I typically use something like:
>> 
>> cat filelist | grep -v generated | ksh ~/code/jdk/webrev/webrev.ksh -m -u mduigou -c `hg qtop` -r qparent -o ~/`hg qtop`/3 -
>> 
>> (where the final trailing "-" is the "read stdin" alternative to providing a filename).
>> 
>> I will make sure the "-f" option disappears in the next webrev revision.
>> 
>> Mike
>> 
>> 
>> On Mar 12 2014, at 20:36 , Lana Steuck <lana.steuck at oracle.com> wrote:
>> 
>>> Was webrev update to work with the new hg (without forest commands)?  I just cloned the latest webrev from http://hg.openjdk.java.net/code-tools/webrev , however it seems that it still uses the old forest command (foutgoing, fstatus, etc.), so it does not work with newer hg (unless I am missing something here...).
>>> 
>>> 
>>> ssteuck at jcia-sparcv9:jdk7u-clone$ /net/jano1.us.oracle.com/export1/jcg/ws-depot/tools/webrev/webrev.ksh -m -f -o ../logs/
>>>   SCM detected: mercurial
>>> WARNING: parent rev is not tip. Maybe an update or merge is needed
>>> File list from hg foutgoing  ...
>>> hg: unknown command 'foutgoing'
>>> 
>>> No outgoing, perhaps you haven't commited.
>>> File list from hg fstatus -mard ... Done.
>>>      Workspace: /export/home/jcia-jobs/7u-jdk7u-dev-pit.20140312-141606/jdk7u-clone
>>>      Output to: /export/home/jcia-jobs/7u-jdk7u-dev-pit.20140312-141606/jdk7u-clone/../logs//webrev
>>>   Output Files:
>>> abort: cannot follow file not in parent revision: "Mercurial"
>>>        Mercurial
>>>                *** Error: file not in parent or child
>>> abort: cannot follow file not in parent revision: "basic"
>>>        basic
>>>                *** Error: file not in parent or child
>>> 
>>> 
>>> On 03/10/2014 10:21 AM, mark.reinhold at oracle.com wrote:
>>>> All servers and up and functioning normally with the exception of
>>>> mail.openjdk.java.net, which is working but slowly.
>>>> 
>>>> Reminders about the Mercurial changes:
>>>> 
>>>>   - The push-only "-gate" repos are no longer be needed and have been
>>>>     removed.  Changes must be pulled from, and pushed to, the same
>>>>     repository.  (Pushes must still be done via ssh, not http.)  If you
>>>>     have recorded "-gate" repository paths in any .hg/hgrc files then
>>>>     you'll have to remove the "-gate" suffix from those paths.
>>>> 
>>>>   - The unsupported Forest extension is no longer present on the servers,
>>>>     so commands such as fpush, fpull, fincoming, etc., will no longer
>>>>     work.  As an alternative you can use the recently-published Trees
>>>>     extension [1] or the existing get_source.sh script [2].
>>>> 
>>>>   - The minimum recommended version of Mercurial on the client side is
>>>>     2.6.3, although earlier versions are likely to continue to work.
>>>> 
>>>>   - The ancient version of hg in /java/devtools will not be updated at
>>>>     this time, but will likely still work.  That version is too old to
>>>>     support the Trees extension [1].
>>>> 
>>>> Additional note:
>>>> 
>>>>   - The SSH host keys on the cr, hg, and closedjdk servers have changed,
>>>>     so you'll need to update your known_hosts file.  On Unix-like systems
>>>>     you can do that with these commands:
>>>> 
>>>>       $ ssh-keygen -R cr.openjdk.java.net
>>>>       $ ssh-keygen -R hg.openjdk.java.net
>>>>       $ ssh-keygen -R closedjdk
>>>>       $ ssh-keygen -R closedjdk.us.oracle.com
>>>> 
>>>> Please report any problems to ops at openjdk dot java dot net.
>>>> 
>>>> - Mark
>>>> 
>>>> 
>>>> [1] http://openjdk.java.net/projects/code-tools/trees
>>>> [2] http://openjdk.java.net/guide/repositories.html#clone
>>> 
>> 
> 
> <webrev-trees.patch>



More information about the webrev-dev mailing list