From f369f3c54e1bab53e11123f7c2fc97acf4dcf304 Mon Sep 17 00:00:00 2001 From: "Dusty.P" Date: Sat, 14 Apr 2018 02:52:08 -0800 Subject: [PATCH] Update pull command to be more robust --- exts/git.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/exts/git.py b/exts/git.py index d4ed46a..d7c33dc 100644 --- a/exts/git.py +++ b/exts/git.py @@ -25,8 +25,18 @@ class Git(): title=f'Git Pull', color=embed_color) em.set_thumbnail(url=f'{ctx.guild.me.avatar_url}') - result = await asyncio.wait_for(self.bot.loop.create_task(run_command('git','pull')),10) - em.add_field(name='Results:', value=f'```{result}```') + result = await asyncio.wait_for(self.bot.loop.create_task(run_command('git','fetch','--all')),10) + results = paginate(result, maxlen=1014) + for page in results[0]: + em.add_field(name='￲', value=f'```{page}```') + result = await asyncio.wait_for(self.bot.loop.create_task(run_command('git','reset','--hard','origin/$(git rev-parse --symbolic-full-name --abbrev-ref HEAD)')),10) + results = paginate(result, maxlen=1014) + for page in results[0]: + em.add_field(name='￲', value=f'```{page}```') + result = await asyncio.wait_for(self.bot.loop.create_task(run_command('git','show','--stat')),10) + results = paginate(result, maxlen=1014) + for page in results[:4]: + em.add_field(name='￲', value=f'```{page}```') await ctx.send(embed=em) @git.command() @@ -37,7 +47,9 @@ class Git(): color=embed_color) em.set_thumbnail(url=f'{ctx.guild.me.avatar_url}') result = await asyncio.wait_for(self.bot.loop.create_task(run_command('git','status')),10) - em.add_field(name='Results:', value=f'```{result}```') + results = paginate(result, maxlen=1014) + for page in results[:5]: + em.add_field(name='￲', value=f'```{page}```') await ctx.send(embed=em)