Dirkjan Ochtman
35a7a2d857
bundlerepo doesn't really have a dirstate, throw AttributeError if requested
2008-11-27 16:07:17 +01:00
Dirkjan Ochtman
d963dd0023
kill some trailing spaces
2008-11-27 16:07:13 +01:00
Benoit Boissinot
7c64bcb65d
merge with mpm
2008-11-27 01:35:12 +01:00
Mads Kiilerich
b229c34697
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
2008-11-27 01:10:27 +01:00
Mads Kiilerich
55633af5c3
buildrpm: complain when hg command isn't available
...
Before it complained "You are not inside a Mercurial repository!" which wasn't true.
2008-11-27 01:09:11 +01:00
Mads Kiilerich
f97a1f6cd5
util: use existing never() instead of custom lambda
2008-11-27 00:57:32 +01:00
Mads Kiilerich
6e4fb4100f
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"
2008-11-27 00:57:31 +01:00
Mads Kiilerich
46204606ec
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.
2008-11-27 00:57:30 +01:00
Patrick Mezard
406c7e1194
util_win32: fix Windows version checking (issue1358)
...
shell.SHGetPathFromIDList() segfaults when called in Apache.
2008-11-26 22:27:37 +01:00
Benoit Boissinot
22d9484189
Catch both IOError and OSError, fix regression introduced by 0018648194a9
2008-11-26 18:23:35 +01:00
Brendan Cully
27542d729d
inotify: remove unused imports (thanks pyflakes)
2008-11-25 18:45:08 -08:00
Brendan Cully
6f67d9ec16
color: don't run status twice for -n
...
Just cut off the status characters.
2008-11-25 18:32:44 -08:00
Brendan Cully
a712d45c18
color: fix status -n
2008-11-25 18:21:00 -08:00
Christian Ebert
2c4205b924
keyword: do not shadow builtin format (detected by pychecker)
2008-11-25 16:30:40 +01:00
Benoit Boissinot
ea0e021c3d
protocol: use changegroupsubset() if possible (issue1389)
...
Due to the fix to the pull race, to avoid sending unnecessary
changesets, use changegroupsubset if possible.
This will increase the load on the server.
2008-11-25 23:26:33 +01:00
Matt Mackall
c163f654f6
Merge with crew
2008-11-25 16:24:22 -06:00
Benoit Allard
f0e30bc7e3
email: add References field in the header
...
This hopefully helps clients get the threading right.
2008-11-25 23:13:14 +01:00
Dirkjan Ochtman
6aedc8f323
coal/paper: link to shortlog instead of log from error pages
2008-11-25 22:52:25 +01:00
Dirkjan Ochtman
919f51ac07
coal/paper: move actual templates from coal to paper
2008-11-25 22:40:16 +01:00
Dirkjan Ochtman
50396f781f
coal/paper: show branch name in changeset view
2008-11-25 22:53:01 +01:00
Benoit Allard
85a72f1622
coal/paper: display tags and branch in filelog page
2008-11-25 21:54:28 +01:00
Benoit Allard
0832593609
coal/paper/monoblue: show branch names in hgweb graph
2008-11-25 22:32:11 +01:00
Benoit Allard
f1183e9953
coal/paper: display branch names in log
2008-11-25 22:51:10 +01:00
Dirkjan Ochtman
5e58c613ca
hgweb: support broken IIS 5 behavior with .cgi in PATH_INFO
2008-11-25 17:54:49 +01:00
Patrick Mezard
8cb1782f3b
manifest: fix _search() corner-case
...
It failed when searching the empty string in the null revision.
2008-11-25 22:23:17 +01:00
Brendan Cully
99c25ba716
Improved error message for log --follow
...
Mads Kiilerich notes that the existing message was unclear
when a nonexistent file was supplied.
2008-11-24 17:16:39 -08:00
Benoit Boissinot
71f1d849f6
Improve the monoblue theme for hgwebdir
2008-11-25 01:22:43 +01:00
Brendan Cully
aad17924e9
import: add similarity option (issue295)
2008-11-22 00:21:57 -08:00
Brendan Cully
02f74c1e7a
mq: recover more gracefully from interrupted qrefresh (issue1216)
2008-11-23 18:08:19 -08:00
Brendan Cully
52891625ce
mq: use atomictempfiles during patch refresh
2008-11-23 16:07:47 -08:00
Brendan Cully
d967180a6e
mq: create patch header class to abstract header manipulation
2008-11-22 14:04:42 -08:00
Brendan Cully
63fa2faa43
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
2008-11-23 00:44:31 -08:00
Alpar Juttner
bc30633124
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.
2008-11-21 22:27:11 +00:00
Mads Kiilerich
b0e14a3f2e
tests: disable test-convert-darcs properly for darcs 2
...
The x bit was disabled without notice in 0018648194a9
2008-11-23 20:16:29 +01:00
Mads Kiilerich
d156191b6c
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.
2008-11-23 18:17:02 +01:00
Mads Kiilerich
171cdd4c59
Make rpm spec less explicit
...
Fixes:
* current buildrpm failing on Fedora because of unexpected zeroconf extensions
* unowned directories hgext/*/
2008-11-23 18:16:02 +01:00
Matt Mackall
3ab25959a6
Merge with crew
2008-11-26 13:11:08 -06:00
Jesse Long
29064bc39c
hooks: restore io correctly on exception
2008-11-25 16:40:54 -06:00
Matt Mackall
648df6f0b1
dispatch: generalize signature checking for extension command wrapping
2008-11-18 16:02:14 -06:00
Matt Mackall
4e3875be62
update help on git diffs
2008-11-18 15:35:34 -06:00
Brendan Cully
662347033e
zsh: make resolve with no options only complete unresolved files
2008-11-17 11:45:38 -08:00
Brendan Cully
f8be17617f
mergetools: add pointer to the usual filemerge path
2008-11-16 20:56:55 -08:00
Brendan Cully
61a488c351
zsh: support for resolve
2008-11-16 19:49:36 -08:00
Peter Arrenbrecht
f5e17bf442
graphlog: fix regression with filelogs introduced by c19a6e3c8257
2008-11-16 20:55:30 +01:00
Patrick Mezard
66e081318f
Merge with crew-stable
2008-11-15 15:57:12 +01:00
Patrick Mezard
ce81a90498
convert: be even more tolerant when detecting svn tags
...
Former code failed when tracking child directories we assumed were renamed with
their parents but were really created in the tags directory. This happens in
jQuery repository with /tags/ui/1.5b4/release@5455.
2008-11-15 15:51:26 +01:00
Patrick Mezard
9abae0a381
test-pull-branch: make it executable
2008-11-15 15:09:11 +01:00
Dirkjan Ochtman
18919db71c
graphlog: fix python2.3 incompatibility (used genexp, sorted())
2008-11-15 12:27:40 +01:00
Christian Ebert
d61322a8dd
keyword: move common code out of commit condition
2008-11-14 22:29:03 +01:00
Matt Mackall
d725fd83a0
lookup: fast-paths for int and 'tip'
2008-11-14 14:12:43 -06:00
