Mercurial > hg > openjdk > jdk8
changeset 905:c1029b02ca87
8027836: Webrev should handle files that has been moved from a directory which now is removed.
Reviewed-by: mduigou, tbell
| author | ihse |
|---|---|
| date | Fri, 08 Nov 2013 09:36:55 +0100 |
| parents | 763ada2a1d8c |
| children | cbfe5da942c6 |
| files | make/scripts/webrev.ksh |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/scripts/webrev.ksh Thu Oct 31 16:24:33 2013 -0700 +++ b/make/scripts/webrev.ksh Fri Nov 08 09:36:55 2013 +0100 @@ -27,7 +27,7 @@ # Documentation is available via 'webrev -h'. # -WEBREV_UPDATED=25.0-hg+openjdk.java.net +WEBREV_UPDATED=25.1-hg+openjdk.java.net HTML='<?xml version="1.0"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -1686,19 +1686,20 @@ # It's a rename (or a move), or a copy, so let's make sure we move # to the right directory first, then restore it once done current_dir=`pwd` - cd $CWS/$PDIR + hg_root=`hg root` + cd $CWS if [ -n "$rflag" ]; then parentrev=$PARENT_REV elif [ "$HG_LIST_FROM_COMMIT" -eq 1 ]; then parentrev=$OUTREV fi if [ -z "$parentrev" ]; then - parentrev=`hg log -l1 $PF | $AWK -F: '/changeset/ {print $2}'` + parentrev=`hg log -l1 $PDIR/$PF | $AWK -F: '/changeset/ {print $2}'` fi if [ -n "$parentrev" ]; then mkdir -p $olddir/$PDIR if [ -z "$parent" ]; then - hg cat --rev $parentrev --output $olddir/$PDIR/$PF $PF 2>/dev/null + hg cat -R $hg_root --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null else $parent cat --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null fi