commands: wrapped docstrings at 78 characters We have always had a left margin of 4 characters -- probably just because that's how docstrings for top-level functions turn out by default, but it also looks nice in the built-in help. The docstrings were wrapped at 70 characters, which is the default for Emacs. However, this gives a right margin of 10 characters in a standard 80 character terminal. I've now wrapped the relevant docstrings at 78 characters, effectively killing the right margin. The asymmetric margins looked a bit odd and some of the text looked cramped with a right margin, so Dirkjan and I felt that it was best to remove it entirely. The two character gap was kept to have some space between the border of the terminal -- it will also make diffs involving the docstrings fit in a 80 character line.

extdiff: fix indentation and use gettext

filemerge, subrepo: correct indention

ui: extract choice from prompt avoid translating single characters (as l for _local or sym_link)

patchbomb: use local time for the Date: header

patchbomb: fix From_ in the message's envelope Localized date in the From_ prevents MUAs like mutt from parsing mbox files generated by patchbomb. Using a 24 characters date in asctime format instead.

merge with crew-stable

Bourne shells do not maintain $PWD; update tests accordingly

tests: remove more instances of export FOO=bar bashism

tests: remove more instances of export FOO=bar bashism

test-gpg: suppress secure memory warning Some platforms (Solaris for one) does not support secure memory and would give a warning.

test: fix for compatibilty with true Bourne /bin/sh 'export foo=bar' is an extension, replaced with 'foo=bar; export foo'

p4: simplify sort key

localrepo: removed unnecessary revkey sort helper

compat: remove unnecessary diamond-shaped multiple inheritance

split local and stdlib module imports (eases migration issues)

compat: don't reference an exception var inside a lambda

compat: use email in favor of mimetools

verify: fix scope issues with del statement

compat: use 'key' argument instead of 'cmp' when sorting a list

compat: use open() instead of file() everywhere

compat: can't compare two values of unequal datatypes

compat: use // for integer division

tests: add -3 switch to run-tests.py

keyword: remove unused import

merge with crew-stable

help: add #revision syntax to the example valid URLs.

context: improve arg-checking assert.

help: add #revision syntax to the example valid URLs.

merge wtih crew-stable