gmane.comp.version-control.mercurial.hgsubversion

push by durin42 - revsets: fix nativerevs fallback on 2013-05-18 14:34 GMT

2013-05-18T14:34:38

Revision: f0ebc7113429
Branch:   default
Author:   Matt Mackall <mpm-VDJrAJ4Gl5ZBDgjK7y7TUQ< at >public.gmane.org>
Date:     Fri May 10 16:52:28 2013
Log:      revsets: fix nativerevs fallback
http://code.google.com/p/hgsubversion/source/detail?r=f0ebc7113429

Modified:
  /hgsubversion/util.py

Re: [PATCH] revsets: fix nativerevs fallback

Augie Fackler — 2013-05-18T14:34:19

Thanks, pushed

On May 14, 2013, at 2:13 PM, Matt Mackall <mpm-VDJrAJ4Gl5ZBDgjK7y7TUQ< at >public.gmane.org> wrote:

Re: [PATCH 6 of 6 RESEND] layouts: use layouts library for branch mappingduring push

Augie Fackler — 2013-05-18T14:29:23

Pending the __unimplemented response, series LGTM.

On May 17, 2013, at 2:48 PM, David Schleimer <dschleimer-b10kYP2dOMg< at >public.gmane.org> wrote:

Re: [PATCH 1 of 6 RESEND] layouts: refactor out svn path to mercurial branch logic

Augie Fackler — 2013-05-18T14:28:04

On May 17, 2013, at 2:48 PM, David Schleimer <dschleimer-b10kYP2dOMg< at >public.gmane.org> wrote:


I think we've had this conversation before, but why this instead of raise NotImplementedError?

[PATCH 5 of 6 RESEND] layouts: use layout library in hg svn info

David Schleimer — 2013-05-17T18:48:36

# HG changeset patch
# User David Schleimer <dschleimer-b10kYP2dOMg< at >public.gmane.org>
# Date 1367270545 25200
#      Mon Apr 29 14:22:25 2013 -0700
# Node ID de9a020b5c1374e2ab43b8598eaa1ab0b2e84a98
# Parent  98ec88e9b81cb748fbbc738db9cf179ddc8a08b1
layouts: use layout library in hg svn info

diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py
--- a/hgsubversion/svncommands.py
+++ b/hgsubversion/svncommands.py
< at >< at > -413,17 +413,8 < at >< at >
         return 0
     r, br = hashes[pn]
     subdir = util.getsvnrev(parent)[40:].split('< at >')[0]
-    if meta.layout == 'single':
-        branchpath = ''
-    elif br == None:
-        branchpath = '/trunk'
-    elif br.startswith('../'):
-        branchpath = '/%s' % br[3:]
-        subdir = subdir.replace('branches/../', '')
-    else:
-        branchpath = '/branches/%s' % br
     remoterepo = svnrepo.svnremoterepo(repo.ui)
-    url = '%s%s' % (remoterepo.svnurl, branchpath)
+    url = meta.layoutobj.remotepath(br, remoterepo.svnurl)
     author = meta.autho

[PATCH 6 of 6 RESEND] layouts: use layouts library for branch mappingduring push

David Schleimer — 2013-05-17T18:48:37

# HG changeset patch
# User David Schleimer <dschleimer-b10kYP2dOMg< at >public.gmane.org>
# Date 1367273515 25200
#      Mon Apr 29 15:11:55 2013 -0700
# Node ID 8f229f470d32c336d0f083834940969e1c6cf5e4
# Parent  de9a020b5c1374e2ab43b8598eaa1ab0b2e84a98
layouts: use layouts library for branch mappingduring push

diff --git a/hgsubversion/pushmod.py b/hgsubversion/pushmod.py
--- a/hgsubversion/pushmod.py
+++ b/hgsubversion/pushmod.py
< at >< at > -99,12 +99,7 < at >< at >
     file_data = {}
     parent = rev_ctx.parents()[0]
     parent_branch = rev_ctx.parents()[0].branch()
-    branch_path = 'trunk'
-
-    if meta.layout == 'single':
-        branch_path = ''
-    elif parent_branch and parent_branch != 'default':
-        branch_path = 'branches/%s' % parent_branch
+    branch_path = meta.layoutobj.remotename(parent_branch)
 
     extchanges = svnexternals.diff(svnexternals.parse(ui, parent),
                                    svnexternals.parse(ui, rev_ctx))
< at >< at > -139,7 +134,7 < at >< at >
                     copies[file] = renamed[0]

[PATCH 1 of 6 RESEND] layouts: refactor out svn path to mercurial branch logic

David Schleimer — 2013-05-17T18:48:32

# HG changeset patch
# User David Schleimer <dschleimer-b10kYP2dOMg< at >public.gmane.org>
# Date 1366841231 25200
#      Wed Apr 24 15:07:11 2013 -0700
# Node ID 14efa60ac7e639f885a00a80bc51e6fba8dc3a07
# Parent  f0bde4bf1f7819b15c93be059b8d01f21cd8a146
layouts: refactor out svn path to mercurial branch logic

This pulls the logic for mapping from svn path to mercurial branch
name out of svnmeta.py and into the new layouts library.  It also sets
up the structure for that library.  This diff does not modify any call
to svnmeta.localname, rather leaving it in place as a simple proxy to
the new layout object.

diff --git a/hgsubversion/layouts/__init__.py b/hgsubversion/layouts/__init__.py
--- a/hgsubversion/layouts/__init__.py
+++ b/hgsubversion/layouts/__init__.py
< at >< at > -9,10 +9,36 < at >< at >
 
 """
 
+from mercurial import util as hgutil
+
 import detect
 import persist
+import single
+import standard
 
 __all__ = [
     "detect",
+    "layout_from_name",
     "persist",
     ]
+
+# This is the authoritative store of what

[PATCH 4 of 6 RESEND] layouts: use layouts library for branch mapping with generating .hgignore

David Schleimer — 2013-05-17T18:48:35

# HG changeset patch
# User David Schleimer <dschleimer-b10kYP2dOMg< at >public.gmane.org>
# Date 1367268712 25200
#      Mon Apr 29 13:51:52 2013 -0700
# Node ID 98ec88e9b81cb748fbbc738db9cf179ddc8a08b1
# Parent  3f9bea9846fa1528bf280ab715421d51785318a2
layouts: use layouts library for branch mapping with generating .hgignore

diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py
--- a/hgsubversion/svncommands.py
+++ b/hgsubversion/svncommands.py
< at >< at > -374,10 +374,9 < at >< at >
     hashes = meta.revmap.hashes()
     parent = util.parentrev(ui, repo, meta, hashes)
     r, br = hashes[parent.node()]
-    if meta.layout == 'single':
-        branchpath = ''
-    else:
-        branchpath = br and ('branches/%s/' % br) or 'trunk/'
+    branchpath = meta.layoutobj.remotename(br)
+    if branchpath:
+        branchpath += '/'
     ignorelines = ['.hgignore', 'syntax:glob']
     dirs = [''] + [d[0] for d in svn.list_files(branchpath, r)
                    if d[1] == 'd']

[PATCH 3 of 6 RESEND] layouts: refactor path component of convinfo generation into layouts lib

David Schleimer — 2013-05-17T18:48:34

# HG changeset patch
# User David Schleimer <dschleimer-b10kYP2dOMg< at >public.gmane.org>
# Date 1367000046 25200
#      Fri Apr 26 11:14:06 2013 -0700
# Node ID 3f9bea9846fa1528bf280ab715421d51785318a2
# Parent  56d7b6f9b761db5a41b93f86f4a26378b6c6f033
layouts: refactor path component of convinfo generation into layouts lib

This adds code responsible for producing an absolute path within the
subversion repository to the new layout objects.  It also uses that
code to generate the path component of the conversion info we stick
into extra.

diff --git a/hgsubversion/layouts/base.py b/hgsubversion/layouts/base.py
--- a/hgsubversion/layouts/base.py
+++ b/hgsubversion/layouts/base.py
< at >< at > -16,9 +16,25 < at >< at >
 
     def localname(self, path):
         """Compute the local name for a branch located at path.
+
+        path should be relative to the repo url.
+
         """
         self.__unimplemented('localname')
 
     def remotename(self, branch):
-        """Compute a subversion path for a mercurial branch name"""
+

[PATCH 2 of 6 RESEND] layouts: refactor mercurial branch to svn path mapping out of svnmeta

David Schleimer — 2013-05-17T18:48:33

# HG changeset patch
# User David Schleimer <dschleimer-b10kYP2dOMg< at >public.gmane.org>
# Date 1366842213 25200
#      Wed Apr 24 15:23:33 2013 -0700
# Node ID 56d7b6f9b761db5a41b93f86f4a26378b6c6f033
# Parent  14efa60ac7e639f885a00a80bc51e6fba8dc3a07
layouts: refactor mercurial branch to svn path mapping out of svnmeta

This leaves the existing svnmeta.remotename as a proxy to the new
layout objects rather than updating any of the callsites.

diff --git a/hgsubversion/layouts/base.py b/hgsubversion/layouts/base.py
--- a/hgsubversion/layouts/base.py
+++ b/hgsubversion/layouts/base.py
< at >< at > -18,3 +18,7 < at >< at >
         """Compute the local name for a branch located at path.
         """
         self.__unimplemented('localname')
+
+    def remotename(self, branch):
+        """Compute a subversion path for a mercurial branch name"""
+        self.__unimplemented('remotename')
diff --git a/hgsubversion/layouts/single.py b/hgsubversion/layouts/single.py
--- a/hgsubversion/layouts/single.py
+++ b/hgsubversion/layouts/sing

[PATCH] revsets: fix nativerevs fallback

Matt Mackall — 2013-05-14T18:13:48

# HG changeset patch
# User Matt Mackall <mpm-VDJrAJ4Gl5ZBDgjK7y7TUQ< at >public.gmane.org>
# Date 1368229948 18000
#      Fri May 10 18:52:28 2013 -0500
# Node ID f0ebc71134292e2f8fe7bfb124d0ad8a487e6d0b
# Parent  f0bde4bf1f7819b15c93be059b8d01f21cd8a146
revsets: fix nativerevs fallback

diff -r f0bde4bf1f78 -r f0ebc7113429 hgsubversion/util.py
--- a/hgsubversion/util.pyTue Apr 23 13:59:38 2013 -0500
+++ b/hgsubversion/util.pyFri May 10 18:52:28 2013 -0500
< at >< at > -343,7 +343,7 < at >< at >
 def revset_stringset(orig, repo, subset, x):
     if x.startswith('r') and x[1:].isdigit():
         return revset_svnrev(repo, subset, ('string', x[1:]))
-    return orig
+    return orig(repo, subset, x)
 
 def getfilestoresize(ui):
     """Return the replay or stupid file memory store size in megabytes or -1"""

[PATCH] updatemeta/rebuildmeta: handle hidden changesets

Dan Villiom Podlaski Christiansen — 2013-05-13T09:53:18

# HG changeset patch
# User Dan Villiom Podlaski Christiansen <dan-QNPPAZlFV9A< at >public.gmane.org>
# Date 1368438589 -7200
#      Mon May 13 11:49:49 2013 +0200
# Node ID 8d77c15a0090e5d4c73c9845b34d734d5cfa186d
# Parent  f0bde4bf1f7819b15c93be059b8d01f21cd8a146
updatemeta/rebuildmeta: handle hidden changesets

diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py
--- a/hgsubversion/svncommands.py
+++ b/hgsubversion/svncommands.py
< at >< at > -135,7 +135,12 < at >< at > def _buildmeta(ui, repo, args, partial=F
     # changesets that close a branch, and store their first parent
     for rev in xrange(startrev, len(repo)):
         util.progress(ui, 'prepare', rev - startrev, total=numrevs)
-        ctx = repo[rev]
+        try:
+            ctx = repo[rev]
+        except error.RepoError:
+            # this revision is hidden
+            continue
+
         convinfo = util.getsvnrev(ctx, None)
         if not convinfo:
             continue
< at >< at > -163,7 +168,12 < at >< at > def _buildmeta(ui, repo, args, partial=F
 
     fo

Re: svn author lookup case insensitive?

Augie Fackler — 2013-05-08T15:05:58

On May 5, 2013, at 1:51 PM, maugustin <augustin.michael-gM/Ye1E23mwN+BqQ9rBEUg< at >public.gmane.org> wrote:


Why not just .lower() authors on the way into the author map and then again when doing the membership check two lines earlier? That'd make the code clearer and more correct.

Also, a test would be nice.

Re: svn author lookup case insensitive?

maugustin — 2013-05-05T17:51:48

Ok. Here is the patch. I can't use hg email since I'm working in a MS 
Outlook environment. There's no SMTP server arround and only HTTP-proxy 
internet access.

The patch:

# HG changeset patch
# User maugustin
# Date 1357638278 -3600
# Node ID 21d013b4ecef0ce5ba1053f4193e532ad44e09a6
# Parent  bdc9b21ea8d079ace9832f9e7240a670a2eba52d
additional authormap lookup with lower-case username

diff --git a/hgsubversion/maps.py b/hgsubversion/maps.py
--- a/hgsubversion/maps.py
+++ b/hgsubversion/maps.py
< at >< at > -85,6 +85,8 < at >< at >
             author = '(no author)'
         if author in self:
             result = self.super.__getitem__(author)
+        elif author.lower() in self:
+            result = self.super.__getitem__(author.lower())
         elif self.ui.configbool('hgsubversion', 'defaultauthors', True):
             self[author] = result = '%s%s' % (author, self.defaulthost)
             msg = 'substituting author "%s" for default "%s"\n'


Am Freitag, 3. Mai 2013 15:57:50 UTC+2 schrieb Augie Fackler:

Re: svn author lookup case insensitive?

Augie Fackler — 2013-05-03T13:57:50

On Fri, May 3, 2013 at 3:14 AM, maugustin
<augustin.michael-gM/Ye1E23mwN+BqQ9rBEUg< at >public.gmane.org> wrote:

Okay, given that, I'd look at a patch. Send a patch inline, so I can
comment on it in my mailreader (hg email does the right thing by
default, and is generally good about not mangling patch contents).

Re: svn author lookup case insensitive?

maugustin — 2013-05-03T07:14:02

Hi Augie,

i've checked login with option --username and --no-auth-cache and I could 
login with username written in lowercase and also in uppercase letters. 
This worked on Windows 7 and on Ubuntu Linux clients. So I think SVN is not 
case-sensitive on usernames.

I think it makes the authorname replacement more stable.

At the moment I've to enter two lines for each user in the authormap 
because I don't know, when the user migrate from Windows XP client to 
Windows 7, because this is the moment where the USERNAME variable is either 
filled in lowercase or uppercase letters.

Kind regards,
Michael

Am Donnerstag, 2. Mai 2013 15:28:45 UTC+2 schrieb Augie Fackler:

Re: svn author lookup case insensitive?

Augie Fackler — 2013-05-02T13:28:45

I could be mistaken, but I don't think Subversion treats usernames as
case-insensitive, I think that might be a Windows defect?

On Thu, May 2, 2013 at 4:03 AM, maugustin
<augustin.michael-gM/Ye1E23mwN+BqQ9rBEUg< at >public.gmane.org> wrote:

svn author lookup case insensitive?

maugustin — 2013-05-02T08:03:00

Hi developer,

would it make sense to do the author lookup during SVN pull run case 
insensitive?

We migrated some maschines from Windows XP to Windows 7 and now the 
username from Windows is not lowercase but uppercase. I've put up now every 
entry in authormap file twice (additional with all letters uppercase) and 
my second change was to patch the hgsubversion code to do the job.

Would you like to accept this patch or have any comment on it?

Kind regards
Michael

push by durin42 - revsets: add support for 'r123' revision labels... on 2013-04-30 17:15 GMT

2013-04-30T17:15:40

Revision: f0bde4bf1f78
Branch:   default
Author:   Matt Mackall <mpm-VDJrAJ4Gl5ZBDgjK7y7TUQ< at >public.gmane.org>
Date:     Tue Apr 23 11:59:38 2013
Log:      revsets: add support for 'r123' revision labels

This is controlled by an hgsubversion.nativerevs boolean (off by default).
http://code.google.com/p/hgsubversion/source/detail?r=f0bde4bf1f78

Modified:
  /hgsubversion/__init__.py
  /hgsubversion/util.py

Re: [PATCH] revsets: add support for 'r123' revision labels

Augie Fackler — 2013-04-30T16:41:50

queued, thanks

On Apr 23, 2013, at 10:32 PM, Matt Mackall <mpm-VDJrAJ4Gl5ZBDgjK7y7TUQ< at >public.gmane.org> wrote:

[PATCH 1 of 6] layouts: refactor out svn path to mercurial branch logic

David Schleimer — 2013-04-29T23:10:07

# HG changeset patch
# User David Schleimer <dschleimer-b10kYP2dOMg< at >public.gmane.org>
# Date 1366841231 25200
#      Wed Apr 24 15:07:11 2013 -0700
# Node ID 8552fbda8e3b552a901fe22425597ff199a77b4f
# Parent  bdc9b21ea8d079ace9832f9e7240a670a2eba52d
layouts: refactor out svn path to mercurial branch logic

This pulls the logic for mapping from svn path to mercurial branch
name out of svnmeta.py and into the new layouts library.  It also sets
up the structure for that library.  This diff does not modify any call
to svnmeta.localname, rather leaving it in place as a simple proxy to
the new layout object.

diff --git a/hgsubversion/layouts/__init__.py b/hgsubversion/layouts/__init__.py
--- a/hgsubversion/layouts/__init__.py
+++ b/hgsubversion/layouts/__init__.py
< at >< at > -9,10 +9,36 < at >< at >
 
 """
 
+from mercurial import util as hgutil
+
 import detect
 import persist
+import single
+import standard
 
 __all__ = [
     "detect",
+    "layout_from_name",
     "persist",
     ]
+
+# This is the authoritative store of what