hgsubversion | 15 Oct 04:04 2014

4 new revisions pushed by durin42 on 2014-10-15 02:04 GMT

4 new revisions:

Revision: 2179747e7fea
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Tue Oct 14 06:55:27 2014 UTC
Log:      push: wrap exchange.push when localrepository.push isn't  
available...
https://code.google.com/p/hgsubversion/source/detail?r=2179747e7fea

Revision: 3a4d74823187
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Tue Oct 14 06:56:13 2014 UTC
Log:      pull: wrap exchange.pull if localrepository.pull isn't  
available...
https://code.google.com/p/hgsubversion/source/detail?r=3a4d74823187

Revision: 2d1f6687980b
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Tue Oct 14 06:57:21 2014 UTC
Log:      wrappers.push: call pull instead of repo.pull...
https://code.google.com/p/hgsubversion/source/detail?r=2d1f6687980b

Revision: 11c8de73b48a
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Tue Oct 14 20:36:32 2014 UTC
Log:      test_rebuildmeta: call exchange.pull if localrepository.pull  
(Continue reading)

hgsubversion | 15 Oct 00:38 2014

push by durin42 - test_util: fix up i18n monkeypatch for Mercurial 3.2... on 2014-10-14 22:38 GMT

Revision: 260212f056b7
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Tue Oct 14 22:12:24 2014 UTC
Log:      test_util: fix up i18n monkeypatch for Mercurial 3.2

Mercurial rev 0d0350cfc7ab changed the API a bit.
https://code.google.com/p/hgsubversion/source/detail?r=260212f056b7

Modified:
  /tests/test_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.

Siddharth Agarwal | 14 Oct 22:43 2014

[PATCH 1 of 5 V3] test_util: fix up i18n monkeypatch for Mercurial 3.2

# HG changeset patch
# User Siddharth Agarwal <sid0@...>
# Date 1413269479 25200
#      Mon Oct 13 23:51:19 2014 -0700
# Node ID 9c679f66dbe45a56d30f9e250c0e9e8e154fee6d
# Parent  012965ab3bf7540c3d9158d6e9cd54d57b36a4a3
test_util: fix up i18n monkeypatch for Mercurial 3.2

Mercurial rev 0d0350cfc7ab changed the API a bit.

diff --git a/tests/test_util.py b/tests/test_util.py
--- a/tests/test_util.py
+++ b/tests/test_util.py
 <at>  <at>  -24,7 +24,7  <at>  <at> 
 from mercurial import node
 from mercurial import scmutil
 from mercurial import ui
-from mercurial import util
+from mercurial import util as hgutil
 from mercurial import extensions

 from hgsubversion import compathacks
 <at>  <at>  -454,9 +454,15  <at>  <at> 

         self.oldenv = dict([(k, os.environ.get(k, None),) for k in
                            ('LANG', 'LC_ALL', 'HGRCPATH',)])
-        self.oldt = i18n.t
-        os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
-        i18n.t = gettext.translation('hg', i18n.localedir, fallback=True)
+        try:
(Continue reading)

Siddharth Agarwal | 14 Oct 19:28 2014

[PATCH 1 of 4 V2] test_util: fix up i18n monkeypatch for Mercurial 3.2

# HG changeset patch
# User Siddharth Agarwal <sid0@...>
# Date 1413269479 25200
#      Mon Oct 13 23:51:19 2014 -0700
# Node ID 9c679f66dbe45a56d30f9e250c0e9e8e154fee6d
# Parent  012965ab3bf7540c3d9158d6e9cd54d57b36a4a3
test_util: fix up i18n monkeypatch for Mercurial 3.2

Mercurial rev 0d0350cfc7ab changed the API a bit.

diff --git a/tests/test_util.py b/tests/test_util.py
--- a/tests/test_util.py
+++ b/tests/test_util.py
 <at>  <at>  -24,7 +24,7  <at>  <at> 
 from mercurial import node
 from mercurial import scmutil
 from mercurial import ui
-from mercurial import util
+from mercurial import util as hgutil
 from mercurial import extensions

 from hgsubversion import compathacks
 <at>  <at>  -454,9 +454,15  <at>  <at> 

         self.oldenv = dict([(k, os.environ.get(k, None),) for k in
                            ('LANG', 'LC_ALL', 'HGRCPATH',)])
-        self.oldt = i18n.t
-        os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
-        i18n.t = gettext.translation('hg', i18n.localedir, fallback=True)
+        try:
(Continue reading)

Siddharth Agarwal | 14 Oct 08:57 2014

[PATCH 1 of 4] test_util: fix up i18n monkeypatch for Mercurial 3.2

# HG changeset patch
# User Siddharth Agarwal <sid0@...>
# Date 1413269479 25200
#      Mon Oct 13 23:51:19 2014 -0700
# Node ID 9c679f66dbe45a56d30f9e250c0e9e8e154fee6d
# Parent  012965ab3bf7540c3d9158d6e9cd54d57b36a4a3
test_util: fix up i18n monkeypatch for Mercurial 3.2

Mercurial rev 0d0350cfc7ab changed the API a bit.

diff --git a/tests/test_util.py b/tests/test_util.py
--- a/tests/test_util.py
+++ b/tests/test_util.py
 <at>  <at>  -24,7 +24,7  <at>  <at> 
 from mercurial import node
 from mercurial import scmutil
 from mercurial import ui
-from mercurial import util
+from mercurial import util as hgutil
 from mercurial import extensions

 from hgsubversion import compathacks
 <at>  <at>  -454,9 +454,15  <at>  <at> 

         self.oldenv = dict([(k, os.environ.get(k, None),) for k in
                            ('LANG', 'LC_ALL', 'HGRCPATH',)])
-        self.oldt = i18n.t
-        os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
-        i18n.t = gettext.translation('hg', i18n.localedir, fallback=True)
+        try:
(Continue reading)

hgsubversion | 17 Sep 17:26 2014

8 new revisions pushed by durin42 on 2014-09-17 15:26 GMT

8 new revisions:

Revision: 4ed0855d211f
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Tue Sep 16 23:42:57 2014 UTC
Log:      compathacks: add hacks for filectxfn deletion contract changing...
https://code.google.com/p/hgsubversion/source/detail?r=4ed0855d211f

Revision: 339b5703000c
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Tue Sep 16 23:02:44 2014 UTC
Log:      test_util: use compat hack for filectxfn for deleted files
https://code.google.com/p/hgsubversion/source/detail?r=339b5703000c

Revision: f96e2495de39
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Tue Sep 16 23:03:31 2014 UTC
Log:      test_push_command: use compat hack for filectxfn for deleted files
https://code.google.com/p/hgsubversion/source/detail?r=f96e2495de39

Revision: 57000c9b53f1
Branch:   default
Author:   Siddharth Agarwal <sid0@...>
Date:     Tue Sep 16 23:15:17 2014 UTC
Log:      stupid: in diff_branchrev, use compat hack for filectxfn for  
deleted f...
https://code.google.com/p/hgsubversion/source/detail?r=57000c9b53f1
(Continue reading)

Siddharth Agarwal | 17 Sep 04:37 2014

[PATCH 1 of 7] compathacks: add hacks for filectxfn deletion contract changing

# HG changeset patch
# User Siddharth Agarwal <sid0@...>
# Date 1410910977 25200
#      Tue Sep 16 16:42:57 2014 -0700
# Node ID ad69553db33c53309604db0822c5d2882d674fc6
# Parent  aa8b72bd1320a4a339fb2b43868df520edce7528
compathacks: add hacks for filectxfn deletion contract changing

Mercurial rev 650b5b6e75ed changed the contract for filectxfn, and rev
d226fe36e362 added a way for us to detect the change.

diff --git a/hgsubversion/compathacks.py b/hgsubversion/compathacks.py
--- a/hgsubversion/compathacks.py
+++ b/hgsubversion/compathacks.py
 <at>  <at>  -1,5 +1,7  <at>  <at> 
 """Functions to work around API changes."""

+import errno
+import sys

 def branchset(repo):
     """Return the set of branches present in a repo.
 <at>  <at>  -26,3 +28,42  <at>  <at> 
         return context.memfilectx(repo, path, data, islink, isexec, copied)
     except TypeError:
         return context.memfilectx(path, data, islink, isexec, copied)
+
+def filectxfn_deleted(memctx, path):
+    """
+    Return None or raise an IOError as necessary if path is deleted.
(Continue reading)

Sean Farley | 9 Sep 06:52 2014
Picon

[PATCH] replay: fix filectxfn compatibility with hg's default branch

# HG changeset patch
# User Sean Farley <sean.michael.farley@...>
# Date 1410238255 25200
#      Mon Sep 08 21:50:55 2014 -0700
# Node ID f808ba27ca48fac8bd0c4e1c346f548efeee9a76
# Parent  f367a446219118983319055ceba06daac4566252
replay: fix filectxfn compatibility with hg's default branch

Mercurial rev 650b5b6e75ed changed the contract for filectxfn, and rev
d226fe36e362 added a way for us to detect the change.

diff --git a/hgsubversion/replay.py b/hgsubversion/replay.py
--- a/hgsubversion/replay.py
+++ b/hgsubversion/replay.py
 <at>  <at>  -145,11 +145,16  <at>  <at>  def _convert_rev(ui, meta, svn, r, tbdel
             extra.update({'branch': parentctx.extra().get('branch', None),
                           'close': 1})

         def filectxfn(repo, memctx, path):
             current_file = files[path]
-            data, isexec, islink, copied = current.pop(current_file)
+            try:
+                data, isexec, islink, copied = current.pop(current_file)
+            except IOError, e:
+                if getattr(context.memctx, '_returnnoneformissingfiles', False):
+                    return None
+                raise e
             if isexec is None or islink is None:
                 flags = parentctx.flags(path)
                 if isexec is None:
(Continue reading)

hgsubversion | 31 Aug 16:04 2014

5 new revisions pushed by durin42 on 2014-08-31 14:03 GMT

5 new revisions:

Revision: ba8485b9fee0
Branch:   default
Author:   David Schleimer <dschleimer@...>
Date:     Sun Nov 17 17:57:00 2013 UTC
Log:      editor: correctly import copies of directories from non-tracked  
or clo...
https://code.google.com/p/hgsubversion/source/detail?r=ba8485b9fee0

Revision: 0d0132cba155
Branch:   default
Author:   David Schleimer <dschleimer@...>
Date:     Tue Apr  8 00:51:59 2014 UTC
Log:      editor: fix edge case with in memory file-store size limit...
https://code.google.com/p/hgsubversion/source/detail?r=0d0132cba155

Revision: d3c79072bc6a
Branch:   default
Author:   David Schleimer <dschleimer@...>
Date:     Tue Apr  8 01:28:35 2014 UTC
Log:      editor: correctly import symlink copy+modify with non-empty  
prefix...
https://code.google.com/p/hgsubversion/source/detail?r=d3c79072bc6a

Revision: 6b15eeb78c1a
Branch:   default
Author:   David Schleimer <dschleimer@...>
Date:     Tue Apr  8 01:44:46 2014 UTC
Log:      editor: fix replay handling for copied + modified symlinks...
(Continue reading)

David Schleimer | 30 Aug 18:23 2014

[PATCH] push: update to branch tip instead of tip

# HG changeset patch
# User David Schleimer <dschleimer@...>
# Date 1409415811 25200
#      Sat Aug 30 09:23:31 2014 -0700
# Node ID cd3dc5d99e6eefaec9ab52de1fb829351a3dec74
# Parent  5c29173759610c399c6982b7fb6645931aa50b5d
push: update to branch tip instead of tip

We previously updated to the repository tip after pushing a revision,
presumably on the assumption that tip would be the last revision we
just pushed.  This assumption is flawed for high traffic repositories.
In particular, you previsouly would sometimes end up on a completley
unrelated commit if someone else commits to a different branch in
between the time we push a revision and pull it back from the server.

This changes to instead update to the branch tip of the branch we were
on at the beginning of the push.  This should be either the revision
we just pushed or a linear descendent of the revision we just pushed,
with a fair degree of reliability.

diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
 <at>  <at>  -210,6 +210,7  <at>  <at> 
             ui.status('Cowardly refusing to push branch merge\n')
             return 0 # results in nonzero exit status, see hg's commands.py
         workingrev = repo.parents()[0]
+        workingbranch = workingrev.branch()
         ui.status('searching for changes\n')
         hashes = meta.revmap.hashes()
(Continue reading)

David Schleimer | 29 Aug 18:34 2014

RE: [PATCH 1 of 4] editor: correctly import copies of directories from non-tracked or closed branches

For whatever reason the original of this isn't making it outside the FB network.  You can pull this series
from https://dschleimer-HWgY0/vhk/IBXFe83j6qeQ <at> public.gmane.org/dschleimer/hgsubversion#6b15eeb78c1a

> -----Original Message-----
> From: David Schleimer [mailto:dschleimer@...]
> Sent: Friday, August 29, 2014 6:27 PM
> To: raf@...
> Cc: hgsubversion@...
> Subject: [PATCH 1 of 4] editor: correctly import copies of directories from
> non-tracked or closed branches
> 
> # HG changeset patch
> # User David Schleimer <dschleimer@...> # Date 1384711020 28800
> #      Sun Nov 17 09:57:00 2013 -0800
> # Node ID ba8485b9fee0d244d124812a457fb0ced8821af8
> # Parent  5c29173759610c399c6982b7fb6645931aa50b5d
> editor: correctly import copies of directories from non-tracked or closed
> branches
> 
> diff --git a/hgsubversion/editor.py b/hgsubversion/editor.py
> --- a/hgsubversion/editor.py
> +++ b/hgsubversion/editor.py
>  <at>  <at>  -239,6 +239,13  <at>  <at> 
>          else:
>              # Resolve missing directories content immediately so the
>              # missing files maybe processed by delete actions.
> +            # we remove the missing directory entries to deal with the case
> +            # where a directory is replaced from e.g. a closed branch
> +            # this will show up as a delete and then a copy
> +            # we process deletes after missing, so we can handle a directory
(Continue reading)


Gmane