Thomas Arendsen Hein
c6d47ef08c
Catch illegal boolean values in hgrc nicely.
...
With hg 0.9.3 the section and parameter name wasn't printed,
with hg 0.9.4 there was a traceback for ValueError.
2007-06-26 20:37:15 +02:00
Thomas Arendsen Hein
b90da02eb3
Added test for earlygetopt fixes (8301dd2ee152 and fd08e85716bd)
2007-06-26 18:39:28 +02:00
Thomas Arendsen Hein
1dcdb0a53a
Fix earlygetop for short options with unnecessary spaces removed
...
Examples:
hg log -qR foo
hg log -Rfoo
hg log -qRfoo
2007-06-26 18:35:31 +02:00
Thomas Arendsen Hein
5b3cfe2be9
Fix and test 'hg backout' without or with too many revisions.
2007-06-26 15:28:17 +02:00
Matt Mackall
ef34871a77
Added signature for changeset e64b8d651071183a358d6f98136eb08450366023
2007-06-25 21:23:24 -05:00
Bryan O'Sullivan
753061d492
Update binary installer files.
2007-06-25 16:35:27 -07:00
Brendan Cully
23fe084573
mq: regularize patch header creation.
...
Do not prefix qnew patches with [mq]: when a message has been given.
Always use [mq]: as the prefix for generated commit messages.
2007-06-25 15:57:01 -07:00
Alexis S. L. Carvalho
08bab0f618
convert: "unknown" is a string
2007-06-25 18:52:12 -03:00
Jean-Francois PIERONNE
7a71f63f2b
OpenVMS patches
2007-06-08 16:24:43 +02:00
Hollis Blanchard
50bf402546
fix 'convert' with single commit repositories
...
The attached patch passes the three 'convert' testcases, and also is
able to successfully convert the git.git repository.
2007-06-25 14:50:25 -05:00
Matt Mackall
469dca271e
backout: report short hash in commit message
2007-06-25 12:44:48 -05:00
Thomas Arendsen Hein
61d51838df
New config option: ui.report_untrusted (defaults to True)
2007-06-25 22:41:15 +02:00
Thomas Arendsen Hein
05fbf9e284
Make earlygetopt return a list of all option values, use the last value.
...
This fixes:
"hg -R" showing a useful error instead of traceback
"hg -R foo --repository bar" using bar instead of foo
And provides a way for other users of earlygetopt to accept more than
one value.
2007-06-25 22:08:10 +02:00
Thomas Arendsen Hein
f4d1e9e360
Fixed sorting inside nearly sorted sections in hgrc.5
2007-06-24 11:17:49 +02:00
Benoit Boissinot
4fdb840ede
Make changeset_printer respect ui diffopts
2007-06-25 11:29:17 -07:00
Brendan Cully
6cc7a712e7
mq: support qnew -I/-X and file name lists
2007-06-25 11:13:27 -07:00
Brendan Cully
4aac760bf3
Merge with mpm
2007-06-25 10:34:53 -07:00
Brendan Cully
22d4a3bbc0
mq: document that qinit -c may be run later
2007-06-25 09:49:40 -07:00
Markus F.X.J. Oberhumer
43b8992e98
gitweb: do not mix shortlog and changelog in summary page.
2007-06-25 14:46:20 +02:00
Markus F.X.J. Oberhumer
974b7c5201
Add option "hidden" to hgwebdir.
...
TODO: should this option be renamed to 'hide_from_index' or
maybe to 'index_ignore' (like Apache's mod_autoindex) ?
2007-06-25 14:46:20 +02:00
Markus F.X.J. Oberhumer
84ffe403b9
Add support for RFC2822 to util.parsedate().
2007-06-25 14:46:20 +02:00
Markus F.X.J. Oberhumer
5460408a1e
Makefile: remove *.pyd files on "make clean".
2007-06-25 14:46:20 +02:00
Markus F.X.J. Oberhumer
b7dfc7940e
Makefile: change "make local" to build a fully working local version.
2007-06-25 14:46:20 +02:00
Matt Mackall
0e05064142
gitweb: hide email addresses in shortlog with |person
2007-06-25 11:35:40 -05:00
Matt Mackall
e9f9dbad44
Make shortlog the default page in hgweb
2007-06-25 11:35:14 -05:00
Matt Mackall
840be93118
hgweb: improve shortlog formatting
...
shorten author with |person
don't shrink font (default font is presumed to be preferred reading size)
set widths based on font ems rather than page percents.
2007-06-25 11:30:05 -05:00
Matt Mackall
9a11c35355
strip: move strip code to a new repair module
2007-06-25 01:26:44 -05:00
Matt Mackall
c8f5240b24
strip: simplify bundle helper
2007-06-25 01:22:45 -05:00
Matt Mackall
e2973b5e3e
strip: pull core strip logic into its own function
2007-06-24 18:22:40 -05:00
Giorgos Keramidas
5f8125a5a3
unbundle: accept multiple file arguments
...
update test-bundle for multiple unbundle support
2007-06-24 10:08:38 -05:00
Eric Hopper
bb53a2c70f
convert: handle new cvsps with Tags: and multiple tags.
2007-06-24 07:22:58 -07:00
Matt Mackall
9f3b2a8b06
cat: return an error on failure
2007-06-24 09:47:54 -05:00
Giorgos Keramidas
5a0956cb5a
tests: add merge test for changeset 32f6be9c37df
...
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.
2007-06-23 22:43:46 -05:00
Emanuele Aina
a6db33bd4a
purge: add the clean alias inspired by git-clean and svn-clean
2007-06-23 22:26:22 -05:00
NIIMI Satoshi
ad08d10949
mercurial.el: ignore errors on hg-after-save-hook()
...
Don't signal an error even if running hg command fails. Otherwise,
succeeding hooks won't be called.
2007-05-22 07:24:06 +09:00
NIIMI Satoshi
2d751dee3c
mercurial.el: change default log range to tip:0
...
If the tip revision is smaller than hg-rev-completion-limit (defaults
to 100), "hg log -r tip:-100" fails.
Since performance does not differ between "hg log -l 50 -r tip:0" and
"hg log -l 50 -r tip:-100" even on large repository, default range can
be changed from "tip:-100" to "tip:0" without any drawbacks.
2007-05-22 08:05:16 +09:00
paul sorenson
7f3fb6d66f
Command in doc comment is now on a single line, fixed
...
after previous formatting broke it.
2007-06-23 22:25:11 -05:00
Emanuele Aina
5968bafc17
purge: don't delete ignored files if --all is not specified
2007-06-06 22:17:35 +02:00
OHASHI Hideya
83f32e7ff9
Enable to select encoding in hgrc web section
...
This patch provides character encoding setting in each repository. After this
patch, You can use multi encoding repositories with one mercurial server.
2007-06-13 18:18:06 +09:00
Thomas Arendsen Hein
2f42bdc4f1
merge with main
2007-06-23 21:11:28 +02:00
Thomas Arendsen Hein
9270e4454c
hgk: Use $HG instead of hg (see 9779a8c8d672)
2007-06-23 21:10:55 +02:00
Matt Mackall
aff448fc36
archive: remove spurious flag_bits setting
...
This makes zip -T on resulting archives work. File permissions are
still retained.
2007-06-23 14:02:41 -05:00
Matt Mackall
3791779d22
convert: sometimes git forgets the author
2007-06-23 13:33:45 -05:00
Thomas Arendsen Hein
22ec03c681
hgeditor: Use $HG to run 'hg diff' (see 9779a8c8d672)
2007-06-23 20:22:17 +02:00
Thomas Arendsen Hein
2e76adae49
Remember path to 'hg' executable and pass to external tools and hooks as $HG.
2007-06-23 20:21:10 +02:00
Thomas Arendsen Hein
45612e4757
Merge with main
2007-06-23 12:05:00 +02:00
Alexis S. L. Carvalho
cc6e60f60e
merge: fix small bug with a failed merge across a rename
...
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
2007-06-22 20:44:40 -03:00
Alexis S. L. Carvalho
769bdcbb59
transplant: fix locking order
2007-06-22 19:43:29 -03:00
Matt Mackall
8dc00c8475
rollback: update help for issue316
2007-06-22 17:29:49 -05:00
Alexis S. L. Carvalho
e85eaa593d
git patches: correct handling of filenames with spaces
...
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name. This allows patch(1) to work correctly. The
same is done for diff --nodates.
This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
2007-06-22 19:06:04 -03:00