Re: No commit in vc?

[Dan Nicolaescu]

Juri Linkov <address@hidden> writes:

  > >       (when pending-merge
  > >         (concat
  > >          (propertize "Warning            : " 'face 'font-lock-warning-face
  > >                      'help-echo shelve-help-echo)
  > >          (propertize "Pending merges, commit recommended before any other 
action"
  > >                      'help-echo (format "A merge has been performed.\nA 
commit from the top-level directory (%s)\nis required before being able to 
check in anything else" root-dir)
  > >                      'face 'font-lock-warning-face)
  > >          "\n"))
  > >       (if shelve
  > >           (concat
  > >            (propertize "Shelves            :\n" 'face 'font-lock-type-face
  > >                        'help-echo shelve-help-echo)
  > >            (mapconcat
  > >             (lambda (x)
  > >               (propertize x
  > >                           'face 'font-lock-variable-name-face
  > >                           'mouse-face 'highlight
  > >                           'help-echo "mouse-3: Show shelve menu\nA: Apply 
and keep shelf\nP: Apply and remove shelf (pop)\nS: Snapshot to a shelf\nC-k: 
Delete shelf"
  > >                           'keymap vc-bzr-shelve-map))
  > >             shelve "\n"))
  > >         (concat
  > >          (propertize "Shelves            : " 'face 'font-lock-type-face
  > >                      'help-echo shelve-help-echo)
  > >          (propertize "No shelved changes"
  > >                      'help-echo shelve-help-echo
  > >                      'face 'font-lock-variable-name-face))))))
  > 
  > I recommend to not display inactive features because "No shelved changes"
  > adds more noise as there will be no "No pending merges".

It's not inactive, it has a tooltip, and the plan is that it will get a
menu and probably some buttons to create a shelf and put a snapshot on a shelf.