color: make label() template function stringify "expr" argument first Since label() should return a string (or a thunk to be evaluated to a string), this change is okay. This helps porting to evalstring() helper. See the next patch for details.

templater: fix shortest() to evaluate int argument and handle error

templater: fix pad() to evaluate int argument and handle error

templater: drop redundant type conversion when evaluating integer argument A function argument may be an integer. In this case, it isn't necessary to convert a value to string and back to integer. Because an argument may be an arbitrary object (e.g. date tuple), TypeError should be caught as well.

templater: factor out function that evaluates argument as integer We have more bare int()s that may raise ValueError or TypeError. This function will be used to fix them.

chgserver: use basename for socket symlink Previously we use full path and the symlink may point to outside (unsafe) world if the directory is moved. This patch fixes it by only linking to basename of the target. Therefore the symbolic link and socket files will always stay in the same directory.

patch: when importing from email, RFC2047-decode From/Subject headers Reported at https://bugs.debian.org/737498

histedit: reword message when a changeset produces no changes There are various ways to use histedit such that an item in the list of things to perform will not result in a change relative to the previous repository state. When that happens, histedit does not keep the commit/message. This changes the note to try to explain to the user that it will not be present in their history.

tests: replace cat.py with cat in test-histedit-fold-non-commute.t

tests: Solaris grep doesn't add a trailing newline when it's missing The bad-extension tests emits a list of not-loaded extensions, and pipes that output through grep. On Solaris, the test-output gets "(no-eol)" appended because although the message has no trailing newline, GNU grep adds it. If we simply add the newline to the message, the problem goes away for both versions of grep.