Use format string for lockname again (was changed by 3e25a6eb5c9a)

Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. I have tried Debian's default emacs and the current CVS version. Default emacs doesn't have highlighting enabled (and being emacs-illiterate I don't know how to enable it) and the CVS emacs' Python highlighting has no problems with ' characters here.

removed trailing whitespace

fix unused variables reported by pychecker

churn: get current terminal width if possible

merge with crew-stable

dirstate.invalidate: avoid rebuilding _map Since hasattr will call __getattr__, the call to hasattr(self, '_dirs') will end up reparsing the dirstate file.

add dirstate._dirtypl variable Theoretically, it's possible to forget modified dirstate parents by doing: dirstate.invalidate() dirstate.setparents(p1, p2) dirstate._map The final access to _map should call _read(), which will unconditionally overwrite dirstate._pl. This doesn't actually happen right now because invalidate accidentally ends up rebuilding dirstate._map.

archive: delay extraction of file revisions This allows us to look only at the filelogs we're interested in, providing a nice speedup if we're archiving only part of a repository.

help: avoid traceback if an extension has only debug commands

convert/subversion: rehandle the no-tags case

Print meaningful error message if os.symlink fails