Mercurial > python-hglib

diff hglib/client.py @ 45:191855a9d813

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client: add merge command
author Idan Kamara <idankk86@gmail.com>
date Tue, 16 Aug 2011 23:57:21 +0300
parents 3a661f63107e
children ebcc5d7dd528
line wrap: on
line diff
--- a/hglib/client.py	Tue Aug 16 23:50:01 2011 +0300
+++ b/hglib/client.py	Tue Aug 16 23:57:21 2011 +0300
@@ -442,6 +442,12 @@
 
         return self._parserevs(out)
 
+    def merge(self, rev=None, force=False, tool=None, cb=None):
+        # we can't really use --preview since merge doesn't support --template
+        args = cmdbuilder('merge', r=rev, f=force, t=tool)
+
+        self.rawcommand(args, prompt=cb)
+
     def move(self, source, dest, after=False, force=False, dryrun=False,
              include=None, exclude=None):
         if not isinstance(source, list):