On 2009-03-16 14:56:11 +0000, Catalin Marinas wrote:
> 2009/3/13 Karl Hasselström <kha@xxxxxxxxxxx>:
>
> > "Repository" is misleading here. Maybe something like
> >
> > ix_c = iw.index.is_clean(self.stack.head)
> > wt_c = iw.worktree_clean()
> > if not ix_c or not wt_c:
> > self.__halt('%s not clean. Use "refresh" or "status --reset"'
> > % { (False, True): 'Index', (True, False): 'Worktree',
> > (False, False): 'Index and worktree' }[(ix_c, wt_c)])
>
> I added two separate if's as I don't find the above readable :-)
>
> if not iw.worktree_clean():
> self.__halt('Worktree not clean. Use "refresh" or "status --reset"')
> if not iw.index.is_clean(self.stack.head):
> self.__halt('Index not clean. Use "refresh" or "status --reset"')
It's actually quite nice once you get used to the idea of ephemeral
dictionaries just for selection inside an expression ... :-)
Your version doesn't generate the "Your index and worktree are both
dirty" warning, but I guess that's OK.
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
