gitweb: fix graph again after previous faulty commit (1e0677756f60)

Improvement to 14ce129cfcd: Use try/except and pass filename on errors Without the second part, the error message would be abort: Is a directory instead of abort: Is a directory: /home/user/.cvspass

gitweb: fix graph display in IE

convert: check existence of ~/.cvspass before reading it

convert cvs: Fix branch name parsing cvsps version 2.2b1 as found in Fedora 10 outputs the following format: --------------------- PatchSet 1 Date: 2008/11/26 00:59:46 Author: mk Branch: HEAD Tag: (none) Branches: INITIAL Log: Initial revision Members: a:INITIAL->1.1 b/c:INITIAL->1.1 --------------------- The parser overwrote the Branch value with noise from the misparsed Branches value.

Fix test breakage introduced in 07faba78cf5a

Ignore eclipse droppings

Add hgcia to hgext

tests: fix test results for 07faba78cf5a

diff: fix obscure off-by-one error in diff -p

bundlerepo doesn't really have a dirstate, throw AttributeError if requested

kill some trailing spaces

merge with mpm

rpm spec: include python egg in rpm Better complicance with packaging guidelines http://fedoraproject.org/wiki/Packaging/Python http://fedoraproject.org/wiki/Packaging/Python/Eggs

buildrpm: complain when hg command isn't available Before it complained "You are not inside a Mercurial repository!" which wasn't true.

util: use existing never() instead of custom lambda

tests: Skip tests if they will fail because of outer repo For different reasons these tests will fail if run in a tmpdir which is in a hg repo. The following three tests assumes no .hg in path dirs - I don't know how to work around that: * test-dispatch explicitly tests for no repo and expects "abort: There is no Mercurial repository here (.hg not found)!" * test-extension expects parentui to be None when not cd'ed to a repo dir * test-globalopts tests that implicit -R works correctly - that could perhaps be done from another repo instead of assuming no repo The following two might be worth investigating further: * test-convert-svn-sink fails for unknown reasons, starting with "abort: unresolved merge conflicts (see hg resolve)" * test-glog gets strange failures when testing "from outer space"

tests: use killdaemons in hgweb tests hgweb tests often failed on my system because the serve port wasn't free when a new hgweb was started; the killed hg wasn't completely dead yet. Now we use killdaemons which waits for the process to die.

util_win32: fix Windows version checking (issue1358) shell.SHGetPathFromIDList() segfaults when called in Apache.

Graphlog extension adds a --graph option to log/in/out The --graph option shows the ascii revision graph when used in conjunction with the incoming, outgoing or log commands. It also makes sure that incompatible options (e.g. --newest-first) are not used.

tests: disable test-convert-darcs properly for darcs 2 The x bit was disabled without notice in 8046f0a070a6

Fix rpmlint warnings contrib/mercurial.spec:9: W: hardcoded-path-in-buildroot-tag /tmp/build.%{name}-%{version}-%{release} A path is hardcoded in your Buildroot tag. It should be replaced by something like %{_tmppath}/%name-root. contrib/mercurial.spec:31: W: rpm-buildroot-usage %prep rm -rf $RPM_BUILD_ROOT $RPM_BUILD_ROOT should not be touched during %build or %prep stage, as it will break short circuiting.

Make rpm spec less explicit Fixes: * current buildrpm failing on Fedora because of unexpected zeroconf extensions * unowned directories hgext/*/

Merge with crew

Catch both IOError and OSError, fix regression introduced by 8046f0a070a6

inotify: remove unused imports (thanks pyflakes)

color: don't run status twice for -n Just cut off the status characters.

color: fix status -n