Matt Mackall
3982f645e8
Add functions for transcoding and manipulating multibyte strings
2006-12-03 16:16:33 -06:00
Matt Mackall
8b091a9c1d
Add encoding detection
2006-12-03 16:16:33 -06:00
Thomas Arendsen Hein
6ffc6480a2
merge with crew
2006-12-02 22:41:05 +01:00
Thomas Arendsen Hein
9b62ceebc7
Move ellipsis code to util.ellipsis() and improve maxlength handling.
2006-12-02 22:35:17 +01:00
Thomas Arendsen Hein
5a535feaec
Use UnexpectedOutput exception instead of RepoError in sshrepo, too.
2006-12-02 22:16:00 +01:00
Thomas Arendsen Hein
50e4cfc1b5
Change sshrepo.repoerror() into a more flexible sshrepo.raise_().
...
Now every exception can be raised with a cleanup, not only hg.RepoError.
2006-12-02 22:15:18 +01:00
Thomas Arendsen Hein
b5dd2b79f8
Don't show traceback on 'hg clone -r unknown ssh://hg.example.com/'.
2006-12-02 21:57:20 +01:00
Alexis S. L. Carvalho
1f3671ab6b
fix qseries -v and guards interaction
...
- rename "status" variable to avoid shadowing an argument
- use a better test to determine whether a patch is applied
2006-12-02 18:41:07 -02:00
Alexis S. L. Carvalho
f52b6657a0
changegroup.py: delay the loading of the bz2 and zlib modules
2006-12-02 16:08:00 -02:00
Alexis S. L. Carvalho
e953792af4
Ignore all errors while parsing the branch cache.
2006-12-02 03:38:55 -02:00
Alexis S. L. Carvalho
b23caa6548
small fixes for test-newbranch
...
- hg tip doesn't use the branch cache; use hg log -r in its place
- commit doesn't use a HG_MERGE environment variable
- change the dates from "0 0" to "1000000 0"
2006-12-02 03:16:17 -02:00
Brendan Cully
8ca3b72e7e
transplant: split filter args into changelog entry and patch
2006-12-01 15:43:48 -08:00
Brendan Cully
77c7691d79
transplant: log source node when recovering too.
2006-12-01 15:00:33 -08:00
Brendan Cully
e29958754d
transplant: clobber old series when transplant fails
2006-12-01 14:30:17 -08:00
Thomas Arendsen Hein
5bd9b60672
merge with crew
2006-12-01 23:28:14 +01:00
Thomas Arendsen Hein
aaa1f20f5a
Use unsigned version format.
...
This way can use one additional bit, and when encountering invalid revlogs
with the first bit set don't produce python warnings or strange error messages.
2006-12-01 23:27:53 +01:00
Thomas Arendsen Hein
d279e55ca0
Improve error message for unknown revlog flags.
...
Old: unknown flags 120000 for ...
New: unknown flags 0x0012 for ...
2006-12-01 23:16:12 +01:00
Brendan Cully
1aa9fe0063
Merge with crew
2006-12-01 13:54:47 -08:00
Brendan Cully
20dae997d6
transplant: "filtering %s\n"
2006-12-01 13:50:09 -08:00
Thomas Arendsen Hein
9e4b3b8023
Don't require a diff which accepts the -N option.
2006-12-01 22:29:47 +01:00
Thomas Arendsen Hein
f3e9b24c98
Compatibility fix for 'ln -sf'.
...
ln of Solaris 8 only accepts "ln -f -s" (in that order), but as the -f isn't
needed here, I simply dropped it.
2006-12-01 22:09:05 +01:00
Alexis S. L. Carvalho
ea7eb1125c
additional fixes for issue436
2006-12-01 16:18:16 -02:00
Thomas Arendsen Hein
ecaffdb830
Fix test-rename-dir-merge for different implementations of ls.
2006-12-01 15:40:23 +01:00
Thomas Arendsen Hein
567a43dbef
Fix test-notify for systems without or with a different version of diffstat.
...
Some diffstat versions say "1 file changed", others "1 files changed".
2006-12-01 14:46:05 +01:00
Thomas Arendsen Hein
2ef3ecaf55
merge with upstream
2006-12-01 13:11:09 +01:00
Benoit Boissinot
14bbb468b3
add test for issue436
2006-12-01 09:42:07 +01:00
Matt Mackall
2ac5552785
verify: add rename link checking
2006-12-01 02:35:46 -06:00
Matt Mackall
b4165617fe
Make revlog error slightly less scary
2006-12-01 02:24:56 -06:00
Matt Mackall
f2217f67ed
Fix argument handling for hg -v pull -v x (issue 436)
2006-12-01 01:42:52 -06:00
Matt Mackall
a3525dd4cb
update bugzilla extension to use ui buffers
2006-12-01 01:29:14 -06:00
Matt Mackall
c571577922
add test for the notify extension
2006-12-01 01:29:13 -06:00
Matt Mackall
bbfb5e4171
fix notify with new ui buffering
2006-12-01 01:28:20 -06:00
Matt Mackall
4674f1ed5e
use ui buffering in changeset printer
...
delete old uibuffer class
delete old stringio class
move show to _show
add new show that uses ui.pushbuffer to buffer
add new flush that writes buffered data
add props arg to changeset_printer to match _templater
2006-12-01 01:28:19 -06:00
Matt Mackall
5ee2088301
add a simple nested buffering scheme to ui
2006-12-01 01:28:18 -06:00
Matt Mackall
2085d36412
make manifest friendlier
...
switch to using context code
..which uses first parent by default
show file hashes only with debug switch
show permissions with verbose
fix up tests
2006-11-30 22:38:48 -06:00
Matt Mackall
d664d787b4
Add missing test output
2006-11-30 19:50:28 -06:00
Matt Mackall
b24119a251
Fix test permission
2006-11-30 18:22:44 -06:00
Matt Mackall
05748f203d
merge: handle directory renames
...
commit: handle new copy dirstate case correctly
findcopies:
keep a map of all copies found for directory logic
add dirs filter
check for merge:followdirs config option
generate a directory move map
find files that match directory move map
manifestmerge:
add directory rename cases
applyupdates:
skip actions with None file
add "d" action
recordupdates:
add "d" action
add simple directory rename test
2006-11-30 17:36:33 -06:00
Matt Mackall
452ab5fc24
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
2006-11-30 17:36:33 -06:00
Matt Mackall
f8e4088f12
merge: move check for empty ancestor into findcopies
2006-11-30 17:36:33 -06:00
Matt Mackall
f9ab52977a
merge: only store one direction of copies in the copy map
...
simplify checkpair
generate copied hash from copy map
make copy cases more symmetrical
2006-11-30 17:36:33 -06:00
Matt Mackall
224d8a5d1f
merge: add copied hash to simplify copy logic
2006-11-30 17:36:33 -06:00
Matt Mackall
1c0e2e44bd
merge: remove unused match logic from findcopies
2006-11-30 17:36:33 -06:00
Matt Mackall
8732a61bab
merge: report destinations of moves in merge action messages
2006-11-30 17:36:33 -06:00
Brendan Cully
deae5133ad
transplant: recover added/removed files after failed application
2006-11-30 13:51:58 -08:00
Brendan Cully
d88675f9d4
transplant: preserve filter changes in --continue log
2006-11-30 11:32:40 -08:00
Brendan Cully
e5abdcc7fc
transplant: fix --continue; add --continue test
2006-11-30 11:09:25 -08:00
Brendan Cully
0dcb9f5388
transplant: show_changeset moved to cmdutil
2006-11-29 22:34:22 -08:00
Thomas Arendsen Hein
aaab521292
Make sed expression in test-committer compatible with GNU sed 3.x.
2006-11-29 08:49:45 +01:00
Benoit Boissinot
3bad25e752
only print a warning when no username is specified
...
- revert most of 8b55c0ba
- display the username during interactive commit
2006-11-28 21:16:05 +01:00
