Changeset 1167 in tailor

Timestamp:

06/20/06 21:07:39 (7 years ago)

Author:

Brendan Cully <brendan@…>

Hash name:

20060620190739-0ae3a-2df4d30f50994531fb1eb09327784c1684c244a6

Message:

[hg] wrapper for commands.*

_hgCommand makes it easier to call commands.* functions, and
ensures they will always have their options dictionary set
correctly.

File:

• vcpx/hg.py (modified) (5 diffs)

vcpx/hg.py

@@ -69 +69 @@
         """Fetch new changesets from the source"""
         repo = self._getRepo()
-        opts = self._defaultOpts('pull')
-
-        commands.pull(repo.ui, repo, "default", **opts)
+
+        self._hgCommand('pull', 'default')
 
         from mercurial.node import bin
@@ -260 +259 @@
         # TODO: keep a handle on the changeset holding this tag? Then
         # we can extract author, log, date from it.
-        opts = self._defaultOpts('tag')
 
         # This seems gross. I don't get why I'm getting a unicode tag when
@@ -282 +280 @@
         except KeyError:
             pass
-        commands.tag(repo.ui, repo, tag, **opts)
+        self._hgCommand('tag', tag)
 
     def _defaultOpts(self, cmd):
@@ -288 +286 @@
         # is easier, and while dispatch is easiest, you lose ui.
         return dict([(f[1], f[2]) for f in commands.find(cmd)[1][1]])
+
+    def _hgCommand(self, cmd, *args, **opts):
+        import os
+
+        allopts = self._defaultOpts(cmd)
+        allopts.update(opts)
+        cmd = getattr(commands, cmd)
+        cmd(self._ui, self._hg, *args, **allopts)
 
     def _removePathnames(self, names):
@@ -370 +376 @@
 
     def _initializeWorkingDir(self):
-        commands.add(self._ui, self._hg, self.basedir)
+        self._hgCommand('add', self.basedir)
 
     def _walk(self, subdir):