Mercurial > hg > hq
changeset 12:92484d1db1b2
fixes
author | Jeff Hammel <jhammel@mozilla.com> |
---|---|
date | Thu, 09 May 2013 15:00:41 -0700 |
parents | f7fee857c69a |
children | 42a1de8a0bd5 |
files | hq/main.py |
diffstat | 1 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hq/main.py Tue Mar 12 14:43:25 2013 -0700 +++ b/hq/main.py Thu May 09 15:00:41 2013 -0700 @@ -28,10 +28,10 @@ # check for network self.network = network - if root is None: - root = call(['hg', 'root']).strip() - self.root = root + # repository root + self.root = root or call(['hg', 'root']).strip() + # hg binary self.binary = binary ### subcommands @@ -68,12 +68,10 @@ self._patch_command(*['hg', 'push']) def pull(self, repo=None): - """ - pull from the root repository - """ + """pull from the root repository""" # TODO: commit prior to realignment call(['hg', 'qpop', '--all']) - call(['hg', 'pull'] + repo and [repo] or []) + call(['hg', 'pull'] + (repo and [repo] or [])) call(['hg', 'qpush', '--all']) def goto(self, patch):