[PATCH] Misc fixes to svnmerge

[Giovanni Bajo <ra...@develer.com>]

Hello,

I committed this patch as r18007. I basically fixes some word-wrapping /
spacing issues, and removes some spare usage of some "advanced" Pythonism.
Theoretically, svnmerge.py should run on any Python version since 2.0, but
I'm a little lazy so I keep forgetting about it :)
I'll restore full compatibility in future patches, this brings us a step
further in that direction though.

[[[
Miscellanous fixes: word-wrap lines at 80th column, try and achieve
compatibility with older Python versions (2.0+).

* contrib/client-side/svnmerge.py:
  (console_width, get_default_head, action_avail, action_merge,
  CommandOpts.print_small_help, global_opts, common_opts, main): Word-wrap.
  (SRCREV, SRCDATE): Rename to...
  (__revision__, __date__): New.
  (action_avail): Avoid printing an empty list of revisions in verbose mode.
  (RevisionList.__nonzero__): Avoid 'bool'.
  (RevisionList.sorted): New.
  (RevisionList.normalized, RevisionList.__iter__): Use new sorted method.
  (construct_merged_log_message): Avoid using '__iter__' method.
  (get_svn_info): Avoid 'key in dict'.
  (OptBase.__init__, Option.__init__, OptionArg.__init__): Avoid 'key in
  dict' and 'dict.pop'.
  (CommandOpts.__init__): Avoid 'types.StringTypes'.
  (CommandOpts.print_command_help): Avoid nested scopes.
]]]
-- 
Giovanni Bajo