Mercurial > public > mercurial-scm > python-hglib

comparison 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
comparison
equal deleted inserted replaced
44:3a661f63107e 45:191855a9d813
440 out = self.rawcommand(args) 440 out = self.rawcommand(args)
441 out = out.split('\0')[:-1] 441 out = out.split('\0')[:-1]
442 442
443 return self._parserevs(out) 443 return self._parserevs(out)
444 444
445 def merge(self, rev=None, force=False, tool=None, cb=None):
446 # we can't really use --preview since merge doesn't support --template
447 args = cmdbuilder('merge', r=rev, f=force, t=tool)
448
449 self.rawcommand(args, prompt=cb)
450
445 def move(self, source, dest, after=False, force=False, dryrun=False, 451 def move(self, source, dest, after=False, force=False, dryrun=False,
446 include=None, exclude=None): 452 include=None, exclude=None):
447 if not isinstance(source, list): 453 if not isinstance(source, list):
448 source = [source] 454 source = [source]
449 455