4:48 p.m.
Lorry is given a "spec" (the .lorry file) that tells it what to mirror
or convert. The spec includes a URL specifying the location of the
upstream repository. For some version control systems, this remote
location is stored in the local copy of the cloned repository, and
future version control operations will use that location, unless told
otherwise. Lorry was not always telling otherwise. This meant that
Subversion and Mercurial conversions would stick to the original URL
in the spec file, even if the spec file was changed later.
These patches fix that.
Lars Wirzenius (2):
Make Subversion lorrying obey URL changes
Make hg pulls use URL from spec, not default
lorry | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
--
1.9.1
4:48 p.m.
New subject: [PATCH 1/2] Make Subversion lorrying obey URL changes
---
lorry | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/lorry b/lorry
index 853c65d..b802ebd 100755
--- a/lorry
+++ b/lorry
@@ -427,6 +427,14 @@ class Lorry(cliapp.Application):
cwd=gitdir)
else:
self.progress('.. updating existing clone')
+
+ # Force URL to the one in the Lorry spec. This way, if the
+ # URL in the spec changes, Lorry accepts the change rather
+ # than using the original one.
+ self.run_program(
+ ['git', 'config', 'svn-remote.svn.url',
spec['url']],
+ cwd=gitdir)
+
# update the remote tracking branches
self.run_program(['git', 'svn', 'fetch'], cwd=gitdir)
--
1.9.1
12:22 p.m.
New subject: [PATCH 1/2] Make Subversion lorrying obey URL changes
On Sun, Oct 26, 2014 at 05:48:06PM +0200, Lars Wirzenius wrote:
---
lorry | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/lorry b/lorry
index 853c65d..b802ebd 100755
--- a/lorry
+++ b/lorry
@@ -427,6 +427,14 @@ class Lorry(cliapp.Application):
cwd=gitdir)
else:
self.progress('.. updating existing clone')
+
+ # Force URL to the one in the Lorry spec. This way, if the
+ # URL in the spec changes, Lorry accepts the change rather
+ # than using the original one.
+ self.run_program(
+ ['git', 'config', 'svn-remote.svn.url',
spec['url']],
+ cwd=gitdir)
+
This is correct, but we also need the layout options to be tweaked.
This should just be a case of unconditionally running the commands that
are run before the `else:`, so I'm ok with a fix up at merge time.
4:48 p.m.
New subject: [PATCH 2/2] Make hg pulls use URL from spec, not default
---
lorry | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lorry b/lorry
index b802ebd..898ee4c 100755
--- a/lorry
+++ b/lorry
@@ -451,7 +451,12 @@ class Lorry(cliapp.Application):
hgdir = os.path.join(dirname, 'hg')
if os.path.exists(hgdir):
self.progress('.. updating hg branch')
- self.run_program(['hg', 'pull', '--quiet',
'--insecure'], cwd=hgdir)
+
+ # Note that we always specify the URL from the spec, so
+ # that if the spec changes, we pick up the new URL.
+ self.run_program(
+ ['hg', 'pull', '--quiet', '--insecure',
spec['url']],
+ cwd=hgdir)
else:
self.progress('.. doing initial hg branch')
self.run_program(['hg', 'clone', '--quiet',
'--insecure', spec['url'], hgdir])
--
1.9.1
12:24 p.m.
On Sun, Oct 26, 2014 at 05:48:05PM +0200, Lars Wirzenius wrote:
Lorry is given a "spec" (the .lorry file) that tells it
what to mirror
or convert. The spec includes a URL specifying the location of the
upstream repository. For some version control systems, this remote
location is stored in the local copy of the cloned repository, and
future version control operations will use that location, unless told
otherwise. Lorry was not always telling otherwise. This meant that
Subversion and Mercurial conversions would stick to the original URL
in the spec file, even if the spec file was changed later.
These patches fix that.
Thanks. +1 on the provision that the gitify_svn is also changed to run
the commands which change svn-remote.svn.*.
12:27 p.m.
On Sun, Oct 26, 2014 at 17:48:05 +0200, Lars Wirzenius wrote:
These patches fix that.
Lars Wirzenius (2):
Make Subversion lorrying obey URL changes
Make hg pulls use URL from spec, not default
lorry | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
These patches look sane, thank you Lars.
Unfortunately I'm not sure if the change in the git config will always work for
git-svn, and also I wonder if the layout option in the spec might also need
support for change.
I guess we need to have a good test of these before we can call it fixed, but I
see no reason to delay merging this work in the meantime.
+1
--
Daniel Silverstone http://www.codethink.co.uk/
Software Engineer GPG 4096/R Key Id: 3CCE BABE 206C 3B69
12:28 p.m.
On Mon, Oct 27, 2014 at 11:27:01AM +0000, Daniel Silverstone wrote:
Unfortunately I'm not sure if the change in the git config will
always work for
git-svn, and also I wonder if the layout option in the spec might also need
support for change.
It does, and updating just the url might be worse than not updating
at all in some cases, so I recommend fixing it up to run the layout
configuring commands unconditionally too.
This should just be a matter of moving the code out of the conditional,
so I'm happy for it to be done at merge time.
12:13 p.m.
On Sun, Oct 26, 2014 at 05:48:05PM +0200, Lars Wirzenius wrote:
Lorry is given a "spec" (the .lorry file) that tells it
what to mirror
or convert. The spec includes a URL specifying the location of the
upstream repository. For some version control systems, this remote
location is stored in the local copy of the cloned repository, and
future version control operations will use that location, unless told
otherwise. Lorry was not always telling otherwise. This meant that
Subversion and Mercurial conversions would stick to the original URL
in the spec file, even if the spec file was changed later.
These patches fix that.
Thanks for the patches, I've tweaked them to also change the svn ref
specs on update too.
3320
days inactive
3330
days old
7 comments
4 participants
participants (4)
-
Daniel Silverstone -
Lars Wirzenius -
Richard Maw -
Richard Maw