Patchwork [3,of,5] subrepo: add pull --subrev support to svn subrepos

login
register
mail settings
Submitter Angel Ezquerra
Date Nov. 23, 2013, 8:28 p.m.
Message ID <4b1f0241786e8c6b5e51.1385238482@Angel-PC.localdomain>
Download mbox | patch
Permalink /patch/3114/
State Superseded
Headers show

Comments

Angel Ezquerra - Nov. 23, 2013, 8:28 p.m.
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1360519887 -3600
#      Sun Feb 10 19:11:27 2013 +0100
# Node ID 4b1f0241786e8c6b5e5117950f4e1d4857718618
# Parent  1a56126a49ffe082e8505dbdebc9bceed5d829de
subrepo: add pull --subrev support to svn subrepos

Pulling does not make sense for subversion subrepos. This change just makes sure
that we do not raise NotImplementedError when we try to pull from subversion
subrepos.

Patch

# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1360519887 -3600
#      Sun Feb 10 19:11:27 2013 +0100
# Node ID 4b1f0241786e8c6b5e5117950f4e1d4857718618
# Parent  1a56126a49ffe082e8505dbdebc9bceed5d829de
subrepo: add pull --subrev support to svn subrepos

Pulling does not make sense for subversion subrepos. This change just makes sure
that we do not raise NotImplementedError when we try to pull from subversion
subrepos.

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -1029,6 +1029,10 @@ 
             if _updateprompt(self._ui, self, dirty, wcrev, new):
                 self.get(state, False)
 
+    def pull(self, opts):
+        # pull is a no-op for SVN
+        return True
+
     def push(self, opts):
         # push is a no-op for SVN
         return True