Commit Graph

6035 Commits

Author SHA1 Message Date
Dirkjan Ochtman
3b49a144eb hgweb: explicitly check if requested command exists 2008-01-28 14:58:03 +01:00
Dirkjan Ochtman
6bc7bb23af hgweb: get rid of raw-related code in hgweb.filerevision() 2008-01-28 13:42:40 +01:00
Christian Ebert
bb3bdb2336 keyword: detect restricted commands thru variable 2008-01-26 13:04:36 +00:00
Patrick Mezard
1c23ba81a1 webcommands: add missing hg import 2008-01-26 22:44:27 +01:00
Patrick Mezard
79c0636ca8 Merge with crew-stable 2008-01-26 20:04:31 +01:00
Patrick Mezard
39190bf52c convert: follow svn module parent moves 2008-01-26 14:45:04 +01:00
Patrick Mezard
517ab12c84 convert: prevent svn branches to leave the root module tree 2008-01-26 14:45:04 +01:00
Patrick Mezard
df58ea1100 convert: checkout svn root revisions
Using changed files is enough if whole history is converted. Checkouts are
required to restrict the conversion to user-supplied subtree.
2008-01-26 14:45:04 +01:00
Patrick Mezard
440a00cc2c convert: fix svn_source.latest() 2008-01-26 14:45:04 +01:00
Patrick Mezard
8eb60ebaa2 convert: display source revision id with --verbose 2008-01-26 14:45:04 +01:00
Jesse Glick
b6fdc96f71 Permitting the import command to accept a --user option.
The prose section of the help text for the command already said that -u and -m
are accepted, but -u was not listed in the table of options, and did not work.
Useful when accepting patches from other people made by hg diff rather than hg
export. For completeness, also accepting -d DATE.
[CHANGES: rebased against 2f0da487820f, --no-commit option.]
2008-01-25 19:49:15 -05:00
Bryan O'Sullivan
7f94d92bf3 Merge with crew 2008-01-25 16:24:00 -08:00
Bryan O'Sullivan
af713110c4 Simplify test-paths 2008-01-25 16:18:00 -08:00
Thomas Arendsen Hein
10700bb24c merge with crew 2008-01-26 01:06:31 +01:00
Bryan O'Sullivan
a8ec1cbdc2 Merge after backout 2008-01-25 16:04:46 -08:00
Bryan O'Sullivan
0b03cc2a5a Backed out changeset 6ac32dcf78a6 2008-01-25 16:04:32 -08:00
Jesse Glick
e01183da16 Permit glob patterns to use nested curly braces. 2008-01-25 15:54:25 -05:00
Thomas Arendsen Hein
3648abc9d4 glog shows at most one file: correct synopsis 2008-01-26 00:14:20 +01:00
Thomas Arendsen Hein
950cdcafb9 Update usage message in test-glog.out
AKA: Remind Thomas to run tests even after trivial changes.
2008-01-25 21:09:14 +01:00
Thomas Arendsen Hein
b7250f2196 Add back elipsis to [OPTION] that was stolen by 35300d41c884 2008-01-25 20:17:48 +01:00
Steve Borho
d28f833304 graphlog: add test for filelog graph 2008-01-25 10:35:04 -06:00
Steve Borho
a089948585 graphlog: add filelog revision grapher
Graph a filelog's DAG, e.g.:  hg glog mercurial/util.py
2008-01-25 10:28:21 -06:00
Thomas Arendsen Hein
4ae55d1279 Test case for hg import --no-commit 2008-01-25 16:18:49 +01:00
Joel Rosdahl
119bfb41b7 Add --no-commit option to import command 2008-01-25 13:48:35 +01:00
Kirill Smelkov
f2664bfd13 qrecord: add tests 2008-01-23 21:49:44 +03:00
Kirill Smelkov
38c0bf7540 qrecord: record complements commit, so qrecord should complement qnew
Also there is an idea flying around to create something that will complement
qrefresh:

- maybe 'qammend'? or
- 'qrefresh --interactive'?

If we settle on '--interactive', then it would be conveniet to add this flag to
'commit' and 'qnew' as well.
2008-01-23 21:49:39 +03:00
Thomas Arendsen Hein
6092c25c73 Remove unneeded "import os.path" 2008-01-23 17:16:33 +01:00
Dirkjan Ochtman
4ea6b6bcae send conservatively capitalized HTTP headers 2008-01-23 14:28:25 +01:00
Christian Ebert
5e101da3a2 keyword: improve use of dicts
- actually use iteritems() when we iter over items of a dictionary
- store commit hooks in dictionary
  (safe, as hook.hook() sorts before execution)
2008-01-22 13:12:43 +01:00
Christian Ebert
7779e712ef keyword: no expansion on qfold (bugfix) 2008-01-23 10:39:19 +01:00
Bryan O'Sullivan
a9cf7ce6a3 Merge with crew 2008-01-25 15:56:22 -08:00
Matt Mackall
7a268371b0 patchbomb: prompt only once for SMTP password
- simplify mail._sendmail to be a function rather than a class
- simplify connect to return a function rather than a class
- move exception handling from mail.sendmail to mail.connect
- use a single connection for all messages in patchbomb
2008-01-17 13:51:59 -06:00
Matt Mackall
a68910fcf1 transactions: don't show a backtrace when journal exists
Now we simply print a message on how to recover.
2008-01-16 11:32:25 -06:00
Matt Mackall
df08f67213 Merge with crew 2008-01-16 11:14:51 -06:00
Matt Mackall
11423d02c7 diff: don't show function name by default
We'd mistakenly made the -p option always on, which meant there was no
way to turn it off. It also meant that we were sometimes splitting
multibyte characters in function name, which isn't a good default.
2008-01-16 11:14:24 -06:00
Ali Gholami Rudi
bdaf736fbc demandimport: handling new relative imports
Mercurial does not work on python2.6 because __import__ takes an
additional argument called level.  This patch merely calls the
built-in __import__ when level is passed.
2008-01-16 19:14:54 +03:30
Dirkjan Ochtman
702f1f50b2 hgweb: move HTTP content types out of header templates
This removes the ability for templates to add custom HTTP headers, which can
easily be re-added if someone needs it. Thanks to asak for repeatedly reviewing
this patch and helping to iron out the quirks.
2008-01-22 10:45:55 +01:00
Dirkjan Ochtman
a51e4d434d hgweb: revert to showing file instead of offering for download 2008-01-22 10:45:52 +01:00
Dirkjan Ochtman
54cd7309f5 hgweb: be sure to send a valid content-type for raw files 2008-01-22 12:31:55 +01:00
Dirkjan Ochtman
83100b06d2 hgweb: use ErrorResponse instead of custom response 2008-01-22 09:28:51 +01:00
Dirkjan Ochtman
cef255cf2f better error reporting for hg serve errors in tests 2008-01-22 09:11:11 +01:00
Dirkjan Ochtman
f4b035d012 hgweb: fix a stupid KeyError introduced in 109699000009
Thanks to Christian Ebert for finding this. Also added a test to prevent this
from happening again.
2008-01-22 09:11:08 +01:00
Dirkjan Ochtman
0b45850058 hgweb: cleanup buglet introduced in 7ec4fd3d8731 2008-01-22 09:11:06 +01:00
Thomas Arendsen Hein
ddce807d45 merge with crew-stable 2008-01-22 00:55:01 +01:00
Christian Ebert
5c18a69d2e Prefer i in d over d.has_key(i) 2008-01-20 14:39:25 +01:00
Alexis S. L. Carvalho
4f4e7fdb65 fix test-strip-cross on solaris
Apparently "ENVVAR=value command" doesn't work when command is a shell
function.

Reported by Richard Lowe.
2008-01-21 13:37:27 -02:00
Patrick Mezard
8c795eef45 Merge with crew-stable 2008-01-21 14:15:38 +01:00
Alexis S. L. Carvalho
d600347898 test-strip-cross: test handling of linkrev crosses in the manifest 2008-01-20 08:12:07 -02:00
Richard Lowe
14130985ea Fix test-strip-cross on Solaris
Solaris /sbin/sh doesn't do brace expansion
2008-01-19 22:16:15 -05:00
Alexis S. L. Carvalho
ba985d288a simplify revlog.strip interface and callers; add docstring
Also, strip files only after the changelog and the manifest.
2008-01-19 18:01:16 -02:00