Benoit Boissinot
773674faf9
merge with crew
2006-12-14 13:30:47 +01:00
Brendan Cully
03d8b3d838
patchbomb: use ui.edit to compose summary mail
2006-12-13 22:53:41 -08:00
Benoit Boissinot
477b524bd8
spelling fix
2006-12-14 00:41:11 +01:00
Matt Mackall
f17a4e1934
Replace demandload with new demandimport
2006-12-13 13:27:09 -06:00
Matt Mackall
2623870448
Remove deprecated old-style branch support
2006-12-12 18:16:23 -06:00
Matt Mackall
d9f0b69ae5
Fix copy detection corner case
...
We were aborting if the copied from rev was before the cut-off limit,
rather than the copied _to_ rev. The copied from rev can be
arbitrarily old.
2006-12-12 17:52:33 -06:00
Steve Borho
8cbd4afec6
zsh: better fix for partial completions
...
Properly handle relative paths followed by partial filenames
hg add ../path/to/file/partial[TAB]
2006-12-12 15:34:11 -06:00
Brendan Cully
ca8a1c87d4
mq: fix qheader without args when guards are applied after qtop
2006-12-12 12:40:51 -08:00
Thomas Arendsen Hein
ec97d785b1
Fix test output for test-mq-guards (changed by e7ca2aa11f8f)
2006-12-12 19:11:01 +01:00
Benoit Boissinot
253a9af902
fix MANIFEST generation
2006-12-12 11:39:05 +01:00
Brendan Cully
149bcf7d29
mq: auto-ignore guards in qinit -c
2006-12-11 16:40:42 -08:00
Brendan Cully
eefc767043
mq: fix explain_pushable for negative guards
2006-12-11 16:32:45 -08:00
Thomas Arendsen Hein
a721ac99f0
Add instructions how to redo/finish failed merge with local working directory.
...
d29fcc4d1e2a already implemented this for branch merges.
2006-12-11 18:09:52 +01:00
Thomas Arendsen Hein
dc76f842d3
hgweb.cgi and hgwebdir.cgi fixes/cleanups for user configurable parts:
...
- "import os" was missing in hgwebdir.cgi, added to comments for both script.
- HGENCODING has to be set before importing hgweb, otherwise you'll get
mixed encoding in changelog vs. file content/diffs.
- "import sys" is only needed when changing sys.path
- document purpose of cgitb.
2006-12-11 14:30:50 +01:00
Matt Mackall
c28aac35b2
Added signature for changeset 139e81557c46be23be36258ff27566ba0ef3312a
2006-12-10 20:08:16 -06:00
Matt Mackall
9403306d21
Make make dist a bit quieter
2006-12-10 19:20:35 -06:00
Matt Mackall
69037db249
Automatically build MANIFEST for make dist
2006-12-10 19:16:38 -06:00
Matt Mackall
e138593173
Remove hard-coded version numbers and release notes from packaging
2006-12-10 17:41:07 -06:00
Alexis S. L. Carvalho
63ae667098
Use UTF-8 in .hg/branch
2006-12-10 20:35:28 -02:00
Thomas Arendsen Hein
ff6b40fc67
Indicate the purpose of the dummy changelog file in itself.
...
Otherwise people getting an error message with an old installation might
wonder why this file is corrupted.
2006-12-10 23:03:53 +01:00
Benoit Boissinot
def42107f3
fix reserved char on windows, '[]+' are allowed
2006-12-10 21:53:01 +01:00
Benoit Boissinot
e5024feef0
fix errors spotted by pychecker
2006-12-10 19:41:57 +01:00
Benoit Boissinot
2d8b8124d8
debuginstall: fix an incorrect variable
2006-12-10 16:24:21 +01:00
Mathieu Clabaut
6913b00ffd
Uniformisation of commit help for -m and -l.
...
Addition of the -m and -l options for hg import.
'hg tag' still lacks the --logfile option which short form conflicts with
its --local option.
2006-11-20 23:37:21 +01:00
Benoit Boissinot
f4cac82bde
streamclone: remove unnecessary test, pconvert names
2006-12-10 14:39:51 +01:00
Benoit Boissinot
78479233cd
debuginstall: fix a copy/paste error
2006-12-10 12:46:47 +01:00
Matt Mackall
6d9bbc8702
Merge Benoit's .hg/store support
2006-12-10 02:11:02 -06:00
Matt Mackall
6665cfa7a3
Add some remedies and a username check to debuginstall
2006-12-10 01:05:00 -06:00
Matt Mackall
0a1958aa22
Update README to mention hg debuginstall
2006-12-10 01:04:28 -06:00
Matt Mackall
306a24652c
Make debuginstall actually attempt to use external patch and merge
...
This will catch some tricky problems with tools and setup.
2006-12-10 00:44:52 -06:00
Matt Mackall
a9176a1e50
Make test-encoding return 0
2006-12-10 00:06:31 -06:00
Matt Mackall
135cce014c
Add debuginstall command to do basic install tests
2006-12-10 00:05:47 -06:00
Matt Mackall
03f3b2efc4
make transcoding more robust
...
default to ASCII
abort if unknown encoding
wrap abort strings with _
add test
2006-12-09 12:46:01 -06:00
Benoit Boissinot
89233a98c7
remove unnecessary call to umask
2006-12-09 18:49:24 +01:00
Thomas Arendsen Hein
731e6e0280
Show the destionation for clone if not specified manually.
2006-12-09 14:19:52 +01:00
Thomas Arendsen Hein
a0d2ead148
Removed unneeded OSError exception handler.
...
OSErrors will already be handled in the outside try/except.
2006-12-09 14:00:36 +01:00
Thomas Arendsen Hein
092e05b0b9
Fixes test-encoding for python2.3 and minor cleanups:
...
- Use koi8-r instead of euc-jp, as the later isn't available in python2.3.
- Add unicode representation for latin1 e', too.
- Use date "1000000 0" like in other tests (though not strictly needed
because we no longer use %c as default datestr format).
2006-12-09 11:16:27 +01:00
Thomas Arendsen Hein
0729b92012
Use util.always instead of creating a new lambda function in show_changeset
...
and simplify the expression.
2006-12-09 09:30:29 +01:00
Matt Mackall
daf6a67d1c
Fix log regression where log -p file showed diffs for other files
2006-12-08 20:44:58 -06:00
Brendan Cully
eed329d895
Fix hg serve -6 getsockname handling
2006-12-08 17:10:40 -08:00
Alexis S. L. Carvalho
edf9fef62b
Allow the user to specify the fallback encoding for the changelog
...
Example: use EUC-JP instead of ISO-8859-1:
[ui]
fallbackencoding = EUC-JP
2006-12-08 22:01:05 -02:00
Thomas Arendsen Hein
82505cdc53
Removed unknown option -t in test-status
2006-12-08 23:33:32 +01:00
Brendan Cully
8ffdf02cf9
Merge with mpm
2006-12-08 14:06:26 -08:00
Matt Mackall
3d47c99e83
Merge with crew
2006-12-08 15:05:39 -06:00
Matt Mackall
a32d76f358
Add doc notes about revert and hg status vs diff
2006-12-08 14:55:45 -06:00
Brendan Cully
6b1ec4a8d2
Merge with mpm
2006-12-08 12:53:51 -08:00
Brendan Cully
844c4a922b
transplant: don't add extra newlines to changelog entry in filter
2006-12-08 12:52:17 -08:00
Matt Mackall
6148417831
context: don't spuriously raise abort when a file goes missing.
2006-12-08 13:14:57 -06:00
Matt Mackall
de9b7a5647
Add notes about diff/merge asymmetry to export, diff, and log
2006-12-08 13:04:10 -06:00
Thomas Arendsen Hein
bbc5e19c09
merge with main
2006-12-08 07:48:47 +01:00