Thread (19 messages) flat view 19 messages, 3 authors, 2016-06-15

Re: [StGit PATCH 1/5] Check for local changes with "goto"

From: Karl Hasselström <hidden>
Date: 2016-06-15 22:46:24

On 2009-03-16 14:56:11 +0000, Catalin Marinas wrote:
2009/3/13 Karl Hasselström [off-list ref]:
quoted
"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@treskal.com
      www.treskal.com/kalle
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help