Patchwork [bitbake-devel,RFC] fetch2/svn.py: use log instead of info to retrieve revision

login
register
mail settings
Submitter Nicolas Dechesne
Date Nov. 1, 2013, 12:36 a.m.
Message ID <1383266185-2917-1-git-send-email-nicolas.dechesne@linaro.org>
Download mbox | patch
Permalink /patch/60921/
State Accepted
Commit 17d8ef0b813a05c231e3dbe6e8bc82a4a9b1d2f8
Headers show

Comments

Nicolas Dechesne - Nov. 1, 2013, 12:36 a.m.
We have faced a corner case situation where the 'last changed
revision' returned from svn info is wrong. It happens when the last
revision is a directory move. e.g. if we assume that the svn
repository at revA has root/x/y/z/foo/bar and it is moved to
root/a/b/c/foo/bar in revB, then svn info 'last change revision' will
return revA. As such when using AUTOREV, we are going to attempt to
retrieve root/a/b/c/foo/bar (as per SRC_URI) but at revA when it did
not exist.

So this patch changes how we retrieve the latest revision and uses
'svn log --limit 1' which gives correct result in all tested cases.

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
 lib/bb/fetch2/svn.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
Nicolas Dechesne - Nov. 4, 2013, 6:48 p.m.
On Thu, Oct 31, 2013 at 5:36 PM, Nicolas Dechesne
<nicolas.dechesne@linaro.org> wrote:
> We have faced a corner case situation where the 'last changed
> revision' returned from svn info is wrong. It happens when the last
> revision is a directory move. e.g. if we assume that the svn
> repository at revA has root/x/y/z/foo/bar and it is moved to
> root/a/b/c/foo/bar in revB, then svn info 'last change revision' will
> return revA. As such when using AUTOREV, we are going to attempt to
> retrieve root/a/b/c/foo/bar (as per SRC_URI) but at revA when it did
> not exist.
>
> So this patch changes how we retrieve the latest revision and uses
> 'svn log --limit 1' which gives correct result in all tested cases.

Richard, thanks for merging in master. any chance this can go to dora
and dylan too, as this is a bug fix? the same patch applies in both
branches, and we are currently using dylan and dora for our projects.

thanks
Robert Yang - Nov. 5, 2013, 1:17 p.m.
On 11/05/2013 02:48 AM, Nicolas Dechesne wrote:
> On Thu, Oct 31, 2013 at 5:36 PM, Nicolas Dechesne
> <nicolas.dechesne@linaro.org> wrote:
>> We have faced a corner case situation where the 'last changed
>> revision' returned from svn info is wrong. It happens when the last
>> revision is a directory move. e.g. if we assume that the svn
>> repository at revA has root/x/y/z/foo/bar and it is moved to
>> root/a/b/c/foo/bar in revB, then svn info 'last change revision' will
>> return revA. As such when using AUTOREV, we are going to attempt to
>> retrieve root/a/b/c/foo/bar (as per SRC_URI) but at revA when it did
>> not exist.
>>
>> So this patch changes how we retrieve the latest revision and uses
>> 'svn log --limit 1' which gives correct result in all tested cases.
>
> Richard, thanks for merging in master. any chance this can go to dora

Hi Nicolas,

I will add it to the queue of dora, thanks.

// Robert


> and dylan too, as this is a bug fix? the same patch applies in both
> branches, and we are currently using dylan and dora for our projects.
>
> thanks
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel
>
>
Paul Eggleton - Nov. 7, 2013, 4:26 p.m.
Hi Nicolas,

On Monday 04 November 2013 10:48:24 Nicolas Dechesne wrote:
> On Thu, Oct 31, 2013 at 5:36 PM, Nicolas Dechesne
> <nicolas.dechesne@linaro.org> wrote:
> > We have faced a corner case situation where the 'last changed
> > revision' returned from svn info is wrong. It happens when the last
> > revision is a directory move. e.g. if we assume that the svn
> > repository at revA has root/x/y/z/foo/bar and it is moved to
> > root/a/b/c/foo/bar in revB, then svn info 'last change revision' will
> > return revA. As such when using AUTOREV, we are going to attempt to
> > retrieve root/a/b/c/foo/bar (as per SRC_URI) but at revA when it did
> > not exist.
> > 
> > So this patch changes how we retrieve the latest revision and uses
> > 'svn log --limit 1' which gives correct result in all tested cases.
> 
> Richard, thanks for merging in master. any chance this can go to dora
> and dylan too, as this is a bug fix? the same patch applies in both
> branches, and we are currently using dylan and dora for our projects.

OK, I've queued it up for dylan as well.

Thanks,
Paul

Patch

diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py
index 9a779d2..123aa13 100644
--- a/lib/bb/fetch2/svn.py
+++ b/lib/bb/fetch2/svn.py
@@ -27,6 +27,7 @@  import os
 import sys
 import logging
 import bb
+import re
 from   bb import data
 from   bb.fetch2 import FetchMethod
 from   bb.fetch2 import FetchError
@@ -91,6 +92,8 @@  class Svn(FetchMethod):
 
         if command == "info":
             svncmd = "%s info %s %s://%s/%s/" % (ud.basecmd, " ".join(options), proto, svnroot, ud.module)
+        elif command == "log1":
+            svncmd = "%s log --limit 1 %s %s://%s/%s/" % (ud.basecmd, " ".join(options), proto, svnroot, ud.module)
         else:
             suffix = ""
             if ud.revision:
@@ -167,14 +170,13 @@  class Svn(FetchMethod):
         """
         Return the latest upstream revision number
         """
-        bb.fetch2.check_network_access(d, self._buildsvncommand(ud, d, "info"))
+        bb.fetch2.check_network_access(d, self._buildsvncommand(ud, d, "log1"))
 
-        output = runfetchcmd("LANG=C LC_ALL=C " + self._buildsvncommand(ud, d, "info"), d, True)
+        output = runfetchcmd("LANG=C LC_ALL=C " + self._buildsvncommand(ud, d, "log1"), d, True)
 
-        revision = None
-        for line in output.splitlines():
-            if "Last Changed Rev" in line:
-                revision = line.split(":")[1].strip()
+        # skip the first line, as per output of svn log
+        # then we expect the revision on the 2nd line
+        revision = re.search('^r([0-9]*)', output.splitlines()[1]).group(1)
 
         return revision