shunichi.goto | 3 Jul 07:15 2015
Picon

[PATCH] use keyword argument to accept change of signature

# HG changeset patch
# User Shun-ichi Goto <shunichi.goto@...>
# Date 1435899760 -32400
#      Fri Jul 03 14:02:40 2015 +0900
# Node ID 29b5fa43c8f5ce92421e04600ce1310daae117ce
# Parent  a04dc0adb0303637867809d1a5495fb1c058ea6c
use keyword argument to accept change of signature

This is required to use with mecurial 3.4.2.
This fix accepts changing of signature like changeset 1457c1f28c92
in mercurial which adds new argument 'opargs' of commands.pull().

diff -r a04dc0adb030 -r 29b5fa43c8f5 hgsubversion/wrappers.py
--- a/hgsubversion/wrappers.py	Thu May 14 13:49:52 2015 +0900
+++ b/hgsubversion/wrappers.py	Fri Jul 03 14:02:40 2015 +0900
 <at>  <at>  -516,7 +516,7  <at>  <at> 
     else:
         ui.status("pulled %d revisions\n" % revisions)

-def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=()):
+def exchangepull(orig, repo, remote, heads=None, force=False, **kw):
     capable = getattr(remote, 'capable', lambda x: False)
     if capable('subversion'):
         # transaction manager is present in Mercurial >= 3.3
 <at>  <at>  -524,8 +524,7  <at>  <at> 
             trmanager = getattr(exchange, 'transactionmanager')
         except AttributeError:
             trmanager = None
-        pullop = exchange.pulloperation(repo, remote, heads, force,
-                                        bookmarks=bookmarks)
(Continue reading)

shunichi.goto | 3 Jul 07:14 2015
Picon

[PATCH] leave from the directory before removing

# HG changeset patch
# User Shun-ichi Goto <shunichi.goto@...>
# Date 1431578992 -32400
#      Thu May 14 13:49:52 2015 +0900
# Node ID a04dc0adb0303637867809d1a5495fb1c058ea6c
# Parent  c7d067c174b8bba942d76c773cacd8e179c55f10
leave from the directory before removing

On Windows, we need to leave from the direcotry before
removing it, otherwise error 32 (ERROR_SHARING_VIOLATION).

diff -r c7d067c174b8 -r a04dc0adb030 tests/test_util.py
--- a/tests/test_util.py	Fri May 29 11:06:54 2015 -0400
+++ b/tests/test_util.py	Thu May 14 13:49:52 2015 +0900
 <at>  <at>  -513,8 +513,8  <at>  <at> 
             i18n._ugettext = self.oldugettext  # Mercurial >= 3.2
         except AttributeError:
             i18n.t = self.oldt
+        os.chdir(self.oldwd)
         rmtree(self.tmpdir)
-        os.chdir(self.oldwd)
         setattr(ui.ui, self.patch[0].func_name, self.patch[0])

         _verify_our_modules()

--

-- 
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.
(Continue reading)

hgsubversion | 29 May 17:52 2015

3 new revisions pushed by durin42 on 2015-05-29 15:52 GMT

3 new revisions:

Revision: 7475c42671b1
Branch:   stable
Author:   Durham Goode <durham@...>
Date:     Fri May 29 03:18:50 2015 UTC
Log:      util: add prefix to PrefixMatch...
https://code.google.com/p/hgsubversion/source/detail?r=7475c42671b1

Revision: 9a78a6524f9d
Branch:   stable
Author:   Laurent Charignon <lcharignon@...>
Date:     Tue May 12 18:36:44 2015 UTC
Log:      native revs: Match changes in core to fix native revs...
https://code.google.com/p/hgsubversion/source/detail?r=9a78a6524f9d

Revision: c7d067c174b8
Branch:   default
Author:   Augie Fackler <raf@...>
Date:     Fri May 29 15:06:54 2015 UTC
Log:      Merge with stable.
https://code.google.com/p/hgsubversion/source/detail?r=c7d067c174b8

==============================================================================
Revision: 7475c42671b1
Branch:   stable
Author:   Durham Goode <durham@...>
Date:     Fri May 29 03:18:50 2015 UTC
Log:      util: add prefix to PrefixMatch

(Continue reading)

Durham Goode | 29 May 05:19 2015

[PATCH] util: add prefix to PrefixMatch

# HG changeset patch
# User Durham Goode <durham@...>
# Date 1432869530 25200
#      Thu May 28 20:18:50 2015 -0700
# Node ID b7c42aceaf904b801d3d3568f181592304667be1
# Parent  ecce8aef4b21ec33ebc916fb4aef6c4d440bb02d
util: add prefix to PrefixMatch

The upstream match object now has a prefix function. Let's add it to our
PrefixMatcher.  The upstream implementation will return False if anypats() is
true, which it is for our PrefixMatcher, so we go ahead and return False.

This was caught by the tests failing.

diff --git a/hgsubversion/util.py b/hgsubversion/util.py
--- a/hgsubversion/util.py
+++ b/hgsubversion/util.py
 <at>  <at>  -227,6 +227,9  <at>  <at>  class PrefixMatch(object):
     def anypats(self):
         return True

+    def prefix(self):
+        return False
+
 def outgoing_revisions(repo, reverse_map, sourcerev):
     """Given a repo and an hg_editor, determines outgoing revisions for the
     current working copy state.

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
(Continue reading)

Durham Goode | 28 May 22:19 2015

[PATCH] native revs: Match changes in core to fix native revs

# HG changeset patch
# User Laurent Charignon <lcharignon@...>
# Date 1431455804 25200
#      Tue May 12 11:36:44 2015 -0700
# Branch hotfix
# Node ID 0618e61708028efed96056039b9dbef850e96e82
# Parent  fd3461f865826f682202fe199715bd343266630a
native revs: Match changes in core to fix native revs

Core changed the definition of stringset, it broke native revset.
This patch fixes it.

diff --git a/hgsubversion/__init__.py b/hgsubversion/__init__.py
--- a/hgsubversion/__init__.py
+++ b/hgsubversion/__init__.py
 <at>  <at>  -178,6 +178,9  <at>  <at>  def reposetup(ui, repo):

     if ui.configbool('hgsubversion', 'nativerevs'):
         extensions.wrapfunction(revset, 'stringset', util.revset_stringset)
+        revset.symbols['stringset'] = revset.stringset
+        revset.methods['string'] = revset.stringset
+        revset.methods['symbol'] = revset.stringset

 _old_local = hg.schemes['file']
 def _lookup(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@...
(Continue reading)

hgsubversion | 13 May 00:10 2015

6 new revisions pushed by durin42 on 2015-05-12 22:10 GMT

6 new revisions:

Revision: 72fe317a7b94
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:56 2014 UTC
Log:      svnmeta: add functionality for configitems in _get_cachedconfig
https://code.google.com/p/hgsubversion/source/detail?r=72fe317a7b94

Revision: 118e6d31b5fc
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:56 2014 UTC
Log:      layouts: generate cached property for custom branches
https://code.google.com/p/hgsubversion/source/detail?r=118e6d31b5fc

Revision: 4cb76904c001
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:56 2014 UTC
Log:      subvertpy_wrapper: add a member to store reference to meta object
https://code.google.com/p/hgsubversion/source/detail?r=4cb76904c001

Revision: 2fb0f3c377c9
Branch:   default
Author:   Sean Farley <sean.michael.farley@...>
Date:     Mon Mar 24 16:20:56 2014 UTC
Log:      svn_swig_wrapper: add a member to store reference to meta object
https://code.google.com/p/hgsubversion/source/detail?r=2fb0f3c377c9

(Continue reading)

Sean Farley | 8 May 20:46 2015

[PATCH 1 of 6] svnmeta: add functionality for configitems in _get_cachedconfig

# HG changeset patch
# User Sean Farley <sean.michael.farley@...>
# Date 1395678056 18000
#      Mon Mar 24 11:20:56 2014 -0500
# Node ID 6ac6eed344a8b2596d15ed63314e1dc0ad8236f8
# Parent  15c313b6056709b82ab11d80de3f02b89a268577
svnmeta: add functionality for configitems in _get_cachedconfig

diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py
--- a/hgsubversion/svnmeta.py
+++ b/hgsubversion/svnmeta.py
 <at>  <at>  -92,10 +92,12  <at>  <at>  class SVNMeta(object):
                     c = self.ui.configbool('hgsubversion', configname, default)
                 elif isinstance(default, int):
                     c = self.ui.configint('hgsubversion', configname, default)
                 elif isinstance(default, list):
                     c = self.ui.configlist('hgsubversion', configname, default)
+                elif isinstance(default, dict):
+                    c = dict(self.ui.configitems(configname))
                 else:
                     c = self.ui.config('hgsubversion', configname, default)

             # load the value from disk
             val = util.load(f, default=default)

--

-- 
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.
(Continue reading)

hgsubversion | 8 May 20:11 2015

push by durin42 - Merge stable back into default. on 2015-05-08 18:11 GMT

Revision: 15c313b60567
Branch:   default
Author:   Augie Fackler <raf@...>
Date:     Fri May  8 18:11:14 2015 UTC
Log:      Merge stable back into default.
https://code.google.com/p/hgsubversion/source/detail?r=15c313b60567

--

-- 
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 | 7 May 21:06 2015

3 new revisions pushed by durin42 on 2015-05-07 19:05 GMT

3 new revisions:

Revision: 6fd0ec01553b
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Tue May  5 18:09:43 2015 UTC
Log:      Merge to stable for release.
https://code.google.com/p/hgsubversion/source/detail?r=6fd0ec01553b

Revision: dde1ade36a49
Branch:   stable
Author:   Andrei Dziahel <develop7@...>
Date:     Thu May  7 08:46:09 2015 UTC
Log:      fixes indent for hgsubversionbranch section in extension help
https://code.google.com/p/hgsubversion/source/detail?r=dde1ade36a49

Revision: 82803ec84c82
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Thu May  7 19:03:12 2015 UTC
Log:      Added tag 1.8.1 for changeset dde1ade36a49
https://code.google.com/p/hgsubversion/source/detail?r=82803ec84c82

==============================================================================
Revision: 6fd0ec01553b
Branch:   stable
Author:   Augie Fackler <raf@...>
Date:     Tue May  5 18:09:43 2015 UTC
Log:      Merge to stable for release.
https://code.google.com/p/hgsubversion/source/detail?r=6fd0ec01553b
(Continue reading)

hgsubversion | 13 Apr 19:24 2015

push by durin42 - add minimum methods for matcher... on 2015-04-13 17:24 GMT

Revision: fd3461f86582
Branch:   default
Author:   Shun-ichi GOTO <shunichi.goto@...>
Date:     Mon Apr 13 13:24:41 2015 UTC
Log:      add minimum methods for matcher

By changeset 24820:5693c834bcb4 in mercurial crew, it become that matcher
object need to implement some common methods, bad(), always(), iseact()
and anypats(). So the PrefixMatch class should be implement them.
https://code.google.com/p/hgsubversion/source/detail?r=fd3461f86582

Modified:
  /hgsubversion/util.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.

Shun-ichi Goto | 13 Apr 15:24 2015
Picon

[PATCH] add minimum methods for matcher

# HG changeset patch
# User Shun-ichi GOTO <shunichi.goto@...>
# Date 1428931481 -32400
#      Mon Apr 13 22:24:41 2015 +0900
# Node ID fd3461f865826f682202fe199715bd343266630a
# Parent  a36e87ae23805ad4f636f6b0cdb5b735603bd98a
add minimum methods for matcher

By changeset 24820:5693c834bcb4 in mercurial crew, it become that matcher
object need to implement some common methods, bad(), always(), iseact()
and anypats(). So the PrefixMatch class should be implement them.

diff -r a36e87ae2380 -r fd3461f86582 hgsubversion/util.py
--- a/hgsubversion/util.py	Fri Mar 27 16:44:05 2015 -0700
+++ b/hgsubversion/util.py	Mon Apr 13 22:24:41 2015 +0900
 <at>  <at>  -215,6 +215,18  <at>  <at> 
     def __call__(self, fn):
         return fn.startswith(self.p)

+    def bad(self, f, msg):
+        pass
+
+    def always(self):
+        return False
+
+    def isexact(self):
+        return False
+
+    def anypats(self):
+        return True
(Continue reading)


Gmane