Fran├žois Dinel | 23 Feb 02:57 2015
Picon

[patch] Support custom "trunk" path

# HG changeset patch
# User Francois Dinel
# Date 1424455983 18000
#      Fri Feb 20 13:13:03 2015 -0500
# Branch stable
# Node ID c5c6470939aae282ab6e4611ba991f4c1f4e0f26
# Parent  b13f320ff4e3af4ea4813185275a4a618d74130d
Allow changing the path to the trunk

diff -r b13f320ff4e3 -r c5c6470939aa hgsubversion/__init__.py
--- a/hgsubversion/__init__.py Fri Jan 30 10:59:13 2015 -0500
+++ b/hgsubversion/__init__.py Fri Feb 20 13:13:03 2015 -0500
<at> <at> -77,6 +77,8 <at> <at>
          'list of paths to search for tags in Subversion repositories'),
         ('', 'branchdir', '',
          'path to search for branches in subversion repositories'),
+        ('', 'trunkdir', '',
+         'path to trunk in subversion repositories'),
         ('', 'infix', '',
          'path relative to trunk, branch an tag dirs to import'),
         ('A', 'authors', '',
diff -r b13f320ff4e3 -r c5c6470939aa hgsubversion/layouts/standard.py
--- a/hgsubversion/layouts/standard.py Fri Jan 30 10:59:13 2015 -0500
+++ b/hgsubversion/layouts/standard.py Fri Feb 20 13:13:03 2015 -0500
<at> <at> -28,10 +28,11 <at> <at>
         # the lambda is to ensure nested paths are handled properly
         meta._gen_cachedconfig('taglocations', ['tags'], 'tag_locations',
                                'tagpaths', lambda x: list(reversed(sorted(x))))
+        meta._gen_cachedconfig('trunkdir', 'trunk', 'trunk_dir')
 
      <at> property
     def trunk(self):
-        return 'trunk' + self.meta.infix
+        return self.meta.trunkdir + self.meta.infix
 
     def localname(self, path):
         if path == self.trunk:
<at> <at> -98,7 +99,7 <at> <at>
         if self.localname(candidate) in known_branches:
             return candidate, '/'.join(components)
 
-        if path == 'trunk' or path.startswith('trunk/'):
+        if path == self.meta.trunkdir or path.startswith(self.meta.trunkdir + '/'):
             return self.trunk, path[len(self.trunk) + 1:]
 
         if path.startswith(self.meta.branchdir):
diff -r b13f320ff4e3 -r c5c6470939aa hgsubversion/wrappers.py
--- a/hgsubversion/wrappers.py Fri Jan 30 10:59:13 2015 -0500
+++ b/hgsubversion/wrappers.py Fri Feb 20 13:13:03 2015 -0500
<at> <at> -593,6 +593,7 <at> <at>
     'tagpaths': ('hgsubversion', 'tagpaths'),
     'authors': ('hgsubversion', 'authormap'),
     'branchdir': ('hgsubversion', 'branchdir'),
+    'trunkdir': ('hgsubversion', 'trunkdir'),
     'infix': ('hgsubversion', 'infix'),
     'filemap': ('hgsubversion', 'filemap'),
     'branchmap': ('hgsubversion', 'branchmap'),

--
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org.
To post to this group, send email to hgsubversion-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org.
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.
hgsubversion | 10 Feb 22:11 2015

2 new revisions pushed by durin42 on 2015-02-10 21:11 GMT

2 new revisions:

Revision: 62fc5850eb28
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Feb  9 01:32:21 2015 UTC
Log:      svncommads: document the auto layout block
https://code.google.com/p/hgsubversion/source/detail?r=62fc5850eb28

Revision: f1b8029cf8e9
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Feb  9 01:32:36 2015 UTC
Log:      svnmeta: pep8
https://code.google.com/p/hgsubversion/source/detail?r=f1b8029cf8e9

==============================================================================
Revision: 62fc5850eb28
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Feb  9 01:32:21 2015 UTC
Log:      svncommads: document the auto layout block
https://code.google.com/p/hgsubversion/source/detail?r=62fc5850eb28

Modified:
  /hgsubversion/svncommands.py

==============================================================================
Revision: f1b8029cf8e9
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Feb  9 01:32:36 2015 UTC
Log:      svnmeta: pep8
https://code.google.com/p/hgsubversion/source/detail?r=f1b8029cf8e9

Modified:
  /hgsubversion/svnmeta.py

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe@...
To post to this group, send email to hgsubversion@...
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.

Sean Farley | 9 Feb 02:32 2015
Picon

[PATCH 1 of 2] svncommads: document the auto layout block

# HG changeset patch
# User Sean Farley <sean.michael.farley@...>
# Date 1423445541 28800
#      Sun Feb 08 17:32:21 2015 -0800
# Node ID 62fc5850eb2802d84ccda5b05436828c9148888a
# Parent  91eb0ad1376a988b18302266577e9e678cffbf6f
svncommads: document the auto layout block

diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py
--- a/hgsubversion/svncommands.py
+++ b/hgsubversion/svncommands.py
 <at>  <at>  -182,12 +182,17  <at>  <at>  def _buildmeta(ui, repo, args, partial=F
         if subdir and subdir[-1] == '/':
             subdir = subdir[:-1]
         assert revpath.startswith(subdir), ('That does not look like the '
                                             'right location in the repo.')

+        # meta.layout is a config-cached property so instead of testing for
+        # None we test to see if the layout is 'auto' and, if so, try to guess
+        # the layout based on the commits (where subdir is compared to the
+        # revpath extracted from the commit)
         if meta.layout == 'auto':
-            meta.layout = meta.layout_from_commit(subdir, revpath, ctx.branch())
+            meta.layout = meta.layout_from_commit(subdir, revpath,
+                                                  ctx.branch())
         elif meta.layout == 'single':
             assert (subdir or '/') == revpath, ('Possible layout detection'
                                                 ' defect in replay')

         # write repository uuid if required

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe@...
To post to this group, send email to hgsubversion@...
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.

hgsubversion | 8 Feb 03:29 2015

9 new revisions pushed by durin42 on 2015-02-08 02:29 GMT

9 new revisions:

Revision: 78133c7ec2fc
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      layouts: add a name property to base
https://code.google.com/p/hgsubversion/source/detail?r=78133c7ec2fc

Revision: 10c87b1dd653
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      layouts: add a name property to single
https://code.google.com/p/hgsubversion/source/detail?r=10c87b1dd653

Revision: a6d3692a5800
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      layouts: add a name property to standard
https://code.google.com/p/hgsubversion/source/detail?r=a6d3692a5800

Revision: f5df4bb6f330
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      layouts: add a name property to custom
https://code.google.com/p/hgsubversion/source/detail?r=f5df4bb6f330

Revision: 80b57ed92544
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      svnmeta: create a new layoutobj if layout has changed
https://code.google.com/p/hgsubversion/source/detail?r=80b57ed92544

Revision: 5f80c92be718
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      svncommands: rip out layout logic and use meta object
https://code.google.com/p/hgsubversion/source/detail?r=5f80c92be718

Revision: 577054dbd9af
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      svnmeta: use self.layout instead of calling ui.config directly
https://code.google.com/p/hgsubversion/source/detail?r=577054dbd9af

Revision: 14dab195b2b4
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:56 2014 UTC
Log:      layouts: update doc string to inform about using the right object
https://code.google.com/p/hgsubversion/source/detail?r=14dab195b2b4

Revision: 91eb0ad1376a
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:56 2014 UTC
Log:      layouts: remove detect.py
https://code.google.com/p/hgsubversion/source/detail?r=91eb0ad1376a

==============================================================================
Revision: 78133c7ec2fc
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      layouts: add a name property to base
https://code.google.com/p/hgsubversion/source/detail?r=78133c7ec2fc

Modified:
  /hgsubversion/layouts/base.py

==============================================================================
Revision: 10c87b1dd653
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      layouts: add a name property to single
https://code.google.com/p/hgsubversion/source/detail?r=10c87b1dd653

Modified:
  /hgsubversion/layouts/single.py

==============================================================================
Revision: a6d3692a5800
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      layouts: add a name property to standard
https://code.google.com/p/hgsubversion/source/detail?r=a6d3692a5800

Modified:
  /hgsubversion/layouts/standard.py

==============================================================================
Revision: f5df4bb6f330
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      layouts: add a name property to custom
https://code.google.com/p/hgsubversion/source/detail?r=f5df4bb6f330

Modified:
  /hgsubversion/layouts/custom.py

==============================================================================
Revision: 80b57ed92544
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      svnmeta: create a new layoutobj if layout has changed
https://code.google.com/p/hgsubversion/source/detail?r=80b57ed92544

Modified:
  /hgsubversion/svnmeta.py

==============================================================================
Revision: 5f80c92be718
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      svncommands: rip out layout logic and use meta object
https://code.google.com/p/hgsubversion/source/detail?r=5f80c92be718

Modified:
  /hgsubversion/svncommands.py

==============================================================================
Revision: 577054dbd9af
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:55 2014 UTC
Log:      svnmeta: use self.layout instead of calling ui.config directly
https://code.google.com/p/hgsubversion/source/detail?r=577054dbd9af

Modified:
  /hgsubversion/svnmeta.py

==============================================================================
Revision: 14dab195b2b4
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:56 2014 UTC
Log:      layouts: update doc string to inform about using the right object
https://code.google.com/p/hgsubversion/source/detail?r=14dab195b2b4

Modified:
  /hgsubversion/layouts/__init__.py

==============================================================================
Revision: 91eb0ad1376a
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:56 2014 UTC
Log:      layouts: remove detect.py
https://code.google.com/p/hgsubversion/source/detail?r=91eb0ad1376a

Deleted:
  /hgsubversion/layouts/detect.py
Modified:
  /hgsubversion/layouts/__init__.py

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe@...
To post to this group, send email to hgsubversion@...
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.

Sean Farley | 7 Feb 01:24 2015
Picon

[PATCH 1 of 9] layouts: add a name property to base

# HG changeset patch
# User Sean Farley <sean.michael.farley@...>
# Date 1395678054 18000
#      Mon Mar 24 11:20:54 2014 -0500
# Node ID 0294355e4911b51b435963c9e8bfcd2fa28152ae
# Parent  cdb1f1923a1ab6ce90170be09c611c47884b2fa9
layouts: add a name property to base

diff --git a/hgsubversion/layouts/base.py b/hgsubversion/layouts/base.py
--- a/hgsubversion/layouts/base.py
+++ b/hgsubversion/layouts/base.py
 <at>  <at>  -15,10 +15,16  <at>  <at>  class BaseLayout(object):
     def __unimplemented(self, method_name):
         raise NotImplementedError(
             "Incomplete layout implementation: %s.%s doesn't implement %s" %
             (self.__module__, self.__name__, method_name))

+     <at> property
+    def name(self):
+        """Return the name of the key for NAME_TO_CLASS so we can easily compute a
+        stale cache."""
+        self.__unimplemented('name')
+
     def localname(self, path):
         """Compute the local name for a branch located at path.

         path should be relative to the repo url.

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe@...
To post to this group, send email to hgsubversion@...
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.

hgsubversion | 30 Jan 20:15 2015

12 new revisions pushed by durin42 on 2015-01-30 19:15 GMT

12 new revisions:

Revision: 631a572658c2
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:53 2014 UTC
Log:      svnmeta: add generated cached branch property
https://code.google.com/p/hgsubversion/source/detail?r=631a572658c2

Revision: fc48e1065926
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:53 2014 UTC
Log:      wrappers: use meta.branch instead of ui.config directly
https://code.google.com/p/hgsubversion/source/detail?r=fc48e1065926

Revision: 4ba1481484e6
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      svnmeta: copy layout_from_commit from detect...
https://code.google.com/p/hgsubversion/source/detail?r=4ba1481484e6

Revision: 8b3b456afd5f
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      svnmeta: copy layout_from_subversion from detect
https://code.google.com/p/hgsubversion/source/detail?r=8b3b456afd5f

Revision: 5a68a6b44336
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      wrappers: call new meta.layout_from_subversion
https://code.google.com/p/hgsubversion/source/detail?r=5a68a6b44336

Revision: 9e46dfddd3a9
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      svnmeta: turn layout into a cached property...
https://code.google.com/p/hgsubversion/source/detail?r=9e46dfddd3a9

Revision: 0326686199f5
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      wrappers: use meta.layout instead of accessing config directly
https://code.google.com/p/hgsubversion/source/detail?r=0326686199f5

Revision: 553c40023729
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 15:00:12 2015 UTC
Log:      Merge default into stable for a release.
https://code.google.com/p/hgsubversion/source/detail?r=553c40023729

Revision: c1756971f882
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 15:58:47 2015 UTC
Log:      __init__: record the versions of Mercurial hgsubversion supports
https://code.google.com/p/hgsubversion/source/detail?r=c1756971f882

Revision: e7d84481cf76
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 15:59:04 2015 UTC
Log:      Added tag 1.8 for changeset c1756971f882
https://code.google.com/p/hgsubversion/source/detail?r=e7d84481cf76

Revision: b13f320ff4e3
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 15:59:13 2015 UTC
Log:      Added signature for changeset e7d84481cf76
https://code.google.com/p/hgsubversion/source/detail?r=b13f320ff4e3

Revision: cdb1f1923a1a
Branch:   default
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 18:47:27 2015 UTC
Log:      Merge with stable.
https://code.google.com/p/hgsubversion/source/detail?r=cdb1f1923a1a

==============================================================================
Revision: 631a572658c2
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:53 2014 UTC
Log:      svnmeta: add generated cached branch property
https://code.google.com/p/hgsubversion/source/detail?r=631a572658c2

Modified:
  /hgsubversion/svnmeta.py

==============================================================================
Revision: fc48e1065926
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:53 2014 UTC
Log:      wrappers: use meta.branch instead of ui.config directly
https://code.google.com/p/hgsubversion/source/detail?r=fc48e1065926

Modified:
  /hgsubversion/wrappers.py

==============================================================================
Revision: 4ba1481484e6
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      svnmeta: copy layout_from_commit from detect

This isn't used currently but will be in a future patch when we get rid of
layouts/detect.py and banish the import hgext_ business once and for all.
https://code.google.com/p/hgsubversion/source/detail?r=4ba1481484e6

Modified:
  /hgsubversion/svnmeta.py

==============================================================================
Revision: 8b3b456afd5f
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      svnmeta: copy layout_from_subversion from detect
https://code.google.com/p/hgsubversion/source/detail?r=8b3b456afd5f

Modified:
  /hgsubversion/svnmeta.py

==============================================================================
Revision: 5a68a6b44336
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      wrappers: call new meta.layout_from_subversion
https://code.google.com/p/hgsubversion/source/detail?r=5a68a6b44336

Modified:
  /hgsubversion/wrappers.py

==============================================================================
Revision: 9e46dfddd3a9
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      svnmeta: turn layout into a cached property

It turns out we don't need the fancy checks that were in the layout property
before so we use our new fancy property generator to cache this property.
https://code.google.com/p/hgsubversion/source/detail?r=9e46dfddd3a9

Modified:
  /hgsubversion/svnmeta.py

==============================================================================
Revision: 0326686199f5
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:54 2014 UTC
Log:      wrappers: use meta.layout instead of accessing config directly
https://code.google.com/p/hgsubversion/source/detail?r=0326686199f5

Modified:
  /hgsubversion/wrappers.py

==============================================================================
Revision: 553c40023729
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 15:00:12 2015 UTC
Log:      Merge default into stable for a release.
https://code.google.com/p/hgsubversion/source/detail?r=553c40023729

Deleted:
  /hgsubversion/layouts/persist.py

==============================================================================
Revision: c1756971f882
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 15:58:47 2015 UTC
Log:      __init__: record the versions of Mercurial hgsubversion supports
https://code.google.com/p/hgsubversion/source/detail?r=c1756971f882

Modified:
  /hgsubversion/__init__.py

==============================================================================
Revision: e7d84481cf76
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 15:59:04 2015 UTC
Log:      Added tag 1.8 for changeset c1756971f882
https://code.google.com/p/hgsubversion/source/detail?r=e7d84481cf76

Modified:
  /.hgtags

==============================================================================
Revision: b13f320ff4e3
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 15:59:13 2015 UTC
Log:      Added signature for changeset e7d84481cf76
https://code.google.com/p/hgsubversion/source/detail?r=b13f320ff4e3

Modified:
  /.hgsigs

==============================================================================
Revision: cdb1f1923a1a
Branch:   default
Author:   Augie Fackler <raf@...>
Date:     Fri Jan 30 18:47:27 2015 UTC
Log:      Merge with stable.
https://code.google.com/p/hgsubversion/source/detail?r=cdb1f1923a1a

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe@...
To post to this group, send email to hgsubversion@...
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.

zaazbbcn | 7 Jan 07:54 2015
Picon

Unable to parse URL '/svn/wx/!svn/bc/75524/wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/overviews/richtextctrl overview.rst

when pull from "https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/" met a "Unable to parse URL" error. it seems hg or hg-svn can not parse url contain space char.

正在拉自 https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/
[r75524] AG: Updated some Phoenix documentation:
M wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/overviews/html_overview.rst
M wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/overviews/index.rst
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/overviews/richtextctrl overview.rst
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetAnchor.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetLeftLocation.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetProtocol.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetRightLocation.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/Font.__init__.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/Font.__init__.2.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/FontInfo.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/ModalDialogHook.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/Point.__init__.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/TextUrlEvent.Clone.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.2.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.3.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/richtext.RichTextEvent.Clone.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/richtext.RichTextHTMLHandler.SetFontSizeMapping.1.py
A wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/snippets/python/converted/richtext.SymbolPickerDialog.1.py
M wxPython/Phoenix/trunk/sphinxtools/constants.py
中止: ("Unable to parse URL '/svn/wx/!svn/bc/75524/wxPython/Phoenix/trunk/docs/sphinx/rest_substitutions/overviews/richtextctrl overview.rst'", 175009)
[command returned code 255 Wed Jan 07 14:11:56 2015]

Tortoisehg 3.2.3 windows7 64bit.

--
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org.
To post to this group, send email to hgsubversion-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org.
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.
hgsubversion | 29 Dec 23:34 2014

push by durin42 - svnexternals: fix for Mercurial 3.3+... on 2014-12-29 22:34 GMT

Revision: 9d5cff8d7f67
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Mon Dec 29 21:15:23 2014 UTC
Log:      svnexternals: fix for Mercurial 3.3+

Mercurial rev 40e62fbd7356 renamed the '_ui' field on subrepos to 'ui'. Set
'ui' everywhere and use it to maintain compatibility across Mercurial  
versions.
https://code.google.com/p/hgsubversion/source/detail?r=9d5cff8d7f67

Modified:
  /hgsubversion/svnexternals.py

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe@...
To post to this group, send email to hgsubversion@...
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.

Siddharth Agarwal | 29 Dec 22:21 2014

[PATCH] svnexternals: fix for Mercurial 3.3+

# HG changeset patch
# User Siddharth Agarwal <sid0@...>
# Date 1419887723 28800
#      Mon Dec 29 13:15:23 2014 -0800
# Node ID 78269dbfb6ae7d719de0587759de890312b09655
# Parent  9a722b5246dff6819576b2b7f424fb62a8968405
svnexternals: fix for Mercurial 3.3+

Mercurial rev 40e62fbd7356 renamed the '_ui' field on subrepos to 'ui'. Set
'ui' everywhere and use it to maintain compatibility across Mercurial versions.

diff --git a/hgsubversion/svnexternals.py b/hgsubversion/svnexternals.py
--- a/hgsubversion/svnexternals.py
+++ b/hgsubversion/svnexternals.py
 <at>  <at>  -390,6 +390,10  <at>  <at> 
     def __init__(self, ctx, path, state):
         state = (state[0].split(':', 1)[1], state[1])
         super(svnsubrepo, self).__init__(ctx, path, state)
+        # Mercurial 3.3+ set 'ui' rather than '_ui' -- set that and use 'ui'
+        # everywhere to maintain compatibility across versions
+        if not hgutil.safehasattr(self, 'ui'):
+            self.ui = ctx._repo.ui

     def get(self, state, *args, **kwargs):
         # Resolve source first
 <at>  <at>  -398,11 +402,11  <at>  <at> 
         try:
             # Getting the root SVN repository URL is expensive.
             # Assume the externals is absolute.
-            source = resolvesource(self._ui, None, source)
+            source = resolvesource(self.ui, None, source)
         except RelativeSourceError:
             svnurl = self._ctx._repo.ui.expandpath('default')
             svnroot = getsvninfo(util.normalize_url(svnurl))[1]
-            source = resolvesource(self._ui, svnroot, source)
+            source = resolvesource(self.ui, svnroot, source)
         # hg 1.9 and higher, append the rev as a peg revision to
         # the source URL, so we cannot add our own. We assume
         # that "-r10 url <at> 2" will be similar to "url <at> 10" most of

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe@...
To post to this group, send email to hgsubversion@...
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.

hgsubversion | 16 Dec 19:37 2014

2 new revisions pushed by durin42 on 2014-12-16 18:37 GMT

2 new revisions:

Revision: 9e85feb93984
Branch:   default
Author:   Mateusz Kwapich <mitrandir@...>
Date:     Sat Dec 13 00:17:11 2014 UTC
Log:      wrappers: improve push performance by reusing the existing  
metadata...
https://code.google.com/p/hgsubversion/source/detail?r=9e85feb93984

Revision: 9a722b5246df
Branch:   default
Author:   Mateusz Kwapich <mitrandir@...>
Date:     Sat Dec 13 00:32:34 2014 UTC
Log:      maps: cache hashes() for the revmap...
https://code.google.com/p/hgsubversion/source/detail?r=9a722b5246df

==============================================================================
Revision: 9e85feb93984
Branch:   default
Author:   Mateusz Kwapich <mitrandir@...>
Date:     Sat Dec 13 00:17:11 2014 UTC
Log:      wrappers: improve push performance by reusing the existing  
metadata

Push operation for n commits regenerated SVNMeta class 2*n+1 times
(one time at beginning, n times in push() loop, 1 time per each of n
pulls). This operation is very costly when the revision map is big.

This commit reuses this metadata every time when there is no rebase
made between svn commits which leads to 1 metadata rebuild in optimistic
case and n+1 metadata rebuilds in pessimistic case (rebase after every  
commit).

To achieve this I added extra parameter to pull command to pass metadata
to it.

All unit tests are passing for this change.
https://code.google.com/p/hgsubversion/source/detail?r=9e85feb93984

Modified:
  /hgsubversion/wrappers.py

==============================================================================
Revision: 9a722b5246df
Branch:   default
Author:   Mateusz Kwapich <mitrandir@...>
Date:     Sat Dec 13 00:32:34 2014 UTC
Log:      maps: cache hashes() for the revmap

This fix caches the hashes() results for revision map. For big
repos the revision map can be huge (>30MB) and this fix is saving us
some time (~0.7s per every subsequent call) by avoiding reversing rev
dictionary multiple times.
https://code.google.com/p/hgsubversion/source/detail?r=9a722b5246df

Modified:
  /hgsubversion/maps.py

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe@...
To post to this group, send email to hgsubversion@...
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.

Mateusz Kwapich | 16 Dec 01:56 2014

[PATCH 1 of 2] wrappers: improve push performance by reusing the existing metadata

# HG changeset patch
# User Mateusz Kwapich <mitrandir@...>
# Date 1418429831 28800
#      Fri Dec 12 16:17:11 2014 -0800
# Node ID edaa02033c3bdbed2be26f41aa4f9dad24dd7338
# Parent  7bbe120be1938ec17608bfcf25f747cd7a1bc2fc
wrappers: improve push performance by reusing the existing metadata

Push operation for n commits regenerated SVNMeta class 2*n+1 times
(one time at beginning, n times in push() loop, 1 time per each of n
pulls). This operation is very costly when the revision map is big.

This commit reuses this metadata every time when there is no rebase
made between svn commits which leads to 1 metadata rebuild in optimistic
case and n+1 metadata rebuilds in pessimistic case (rebase after every commit).

To achieve this I added extra parameter to pull command to pass metadata
to it.

All unit tests are passing for this change.

diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
 <at>  <at>  -261,6 +261,8  <at>  <at> 

                 # Don't trust the pre-rebase repo and context.
                 repo = getlocalpeer(ui, {}, meta.path)
+                meta = repo.svnmeta(svn.uuid, svn.subdir)
+                hashes = meta.revmap.hashes()
                 tip_ctx = repo[tip_ctx.node()]
                 for c in tip_ctx.descendants():
                     rebasesrc = c.extra().get('rebase_source')
 <at>  <at>  -289,10 +291,8  <at>  <at> 

             # 5. Pull the latest changesets from subversion, which will
             # include the one we just committed (and possibly others).
-            r = pull(repo, dest, force=force)
+            r = pull(repo, dest, force=force, meta=meta)
             assert not r or r == 0
-            meta = repo.svnmeta(svn.uuid, svn.subdir)
-            hashes = meta.revmap.hashes()

             # 6. Move our tip to the latest pulled tip
             for c in tip_ctx.descendants():
 <at>  <at>  -379,7 +379,7  <at>  <at> 
     else:
         return orig(repo, remote, force, revs, newbranch, bookmarks=bookmarks)

-def pull(repo, source, heads=[], force=False):
+def pull(repo, source, heads=[], force=False, meta=None):
     """pull new revisions from Subversion"""
     assert source.capable('subversion')
     svn_url = source.svnurl
 <at>  <at>  -394,7 +394,8  <at>  <at> 
             repo.ui.note('fetching stupidly...\n')

         svn = source.svn
-        meta = repo.svnmeta(svn.uuid, svn.subdir)
+        if meta is None:
+            meta = repo.svnmeta(svn.uuid, svn.subdir)

         stopat_rev = util.parse_revnum(svn, checkout)

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to hgsubversion+unsubscribe@...
To post to this group, send email to hgsubversion@...
Visit this group at http://groups.google.com/group/hgsubversion.
For more options, visit https://groups.google.com/d/optout.


Gmane