jake@edge2.net
b58f1149d5
fix problem with non wrapping file list
...
fix file list not appearing in checkin
2005-05-21 16:21:16 -07:00
jake@edge2.net
318e83d25f
added template support for some hgweb output, also, template files for
...
the parts that have been converted
2005-05-21 16:13:42 -07:00
jake@edge2.net
1f51ebafe5
making hgweb class
2005-05-21 11:46:16 -07:00
jake@edge2.net
e4aeedbc5c
moving hgweb to mercurial subdir
2005-05-21 11:35:26 -07:00
mpm@selenic.com
a264d87bbd
Fix braindamaged import in mdiff.
2005-05-20 19:19:25 -08:00
mpm@selenic.com
b4d3ada8cd
Remove some debugging code from lazyparser
2005-05-20 17:50:11 -08:00
mpm@selenic.com
36152aee36
Remove python version of the patches code
2005-05-20 17:49:25 -08:00
mpm@selenic.com
4e35c669ab
Add a function to return the new text from a binary diff
2005-05-20 17:42:29 -08:00
mpm@selenic.com
ea4eabe690
Add code to retrieve or construct a revlog delta
2005-05-20 17:40:24 -08:00
mpm@selenic.com
484dde5595
Add fileopener to move some pathname knowledge from filelog to repository
2005-05-20 17:38:01 -08:00
mpm@selenic.com
a8e8d775f0
Make revision code slightly faster
2005-05-20 17:36:02 -08:00
mpm@selenic.com
a3b0765ce7
Only use lazy indexing for big indices and avoid the overhead of the
...
lazy index in the small index case.
2005-05-20 17:35:20 -08:00
mpm@selenic.com
06820561ca
Make lazyindex load slightly faster
2005-05-20 17:34:04 -08:00
mpm@selenic.com
24c5c243a2
Simplify checkout slightly, replace checkdir with os.makedirs
2005-05-20 17:33:24 -08:00
mpm@selenic.com
066f1e4183
Sort files on check-in for good I/O patterns
2005-05-20 17:31:55 -08:00
mpm@selenic.com
8b0e7913c6
Make compression more intelligent:
...
- we don't attempt to compress things under 44 bytes (empirical)
- we check whether larger objects actually compress
- we tag objects to indicate their compression
NUL means uncompressed and starts with NUL
x means gzipped and starts with x (handy)
u means uncompressed, drop the u
2005-05-20 17:31:12 -08:00
mpm@selenic.com
c60581071a
Move hg from storing files in data with base64 encoding to full
...
pathnames with .i and .d extensions. This means we naturally get good
FS layout, and cp and tar fix things up nicely rather than pessimizing
layout.
2005-05-20 17:27:21 -08:00
mpm@selenic.com
836655a3c5
Annotate was being too clever trying to work in place, and triggering
...
its assert. Simplify it, fix it, and speed it up a tiny bit.
2005-05-20 17:22:02 -08:00
mpm@selenic.com
7a540c10d5
Warn if we fail to truncate something
2005-05-20 17:20:39 -08:00
mpm@selenic.com
aea9850302
Make prompting go
...
Minor UI tweaking
Add merge prompting
2005-05-18 18:25:37 -08:00
mpm@selenic.com
fb1218fe40
Add paranoia to diff code
2005-05-18 16:59:54 -08:00
mpm@selenic.com
21089cd87c
Add iterator to the lazymap code
2005-05-18 16:47:49 -08:00
mpm@selenic.com
785f7947d7
Add updated merge3 code
2005-05-18 16:45:44 -08:00
mpm@selenic.com
2bbb8b5a72
Beginnings of transaction undo support
2005-05-18 16:31:51 -08:00
mpm@selenic.com
7e5280f30b
Refactor merge code
...
Delete old code
Fix calculation of newer nodes on server
Fix branch recursion on client
Fix manifest merge problems
Add more debugging and note messages to merge
2005-05-18 16:29:39 -08:00
mpm@selenic.com
060e7fe13f
Fix manifest merge swap bug
...
Add more debug info to merge
2005-05-17 13:38:21 -08:00
mpm@selenic.com
f2ebab86cb
Friendlier exceptions for unknown node errors
2005-05-17 12:20:29 -08:00
mpm@selenic.com
ca952e3eda
Fix merge bug, I hope
2005-05-17 11:40:45 -08:00
mpm@selenic.com
6795b63eb7
More useful message on broken addgroup chain
2005-05-17 11:40:26 -08:00
mpm@selenic.com
77028dbcc6
Add -q quiet option
...
Make -d and -v do something
Add a bunch of debug and note messages
2005-05-17 11:06:59 -08:00
mpm@selenic.com
e85a2a9d28
Gotos are embarrassing.
2005-05-17 10:13:00 -08:00
mpm@selenic.com
08e7e95781
Add basic annotation support
...
filelog.annotate() will get the change number on each line.
Singed-Off-by: Christopher Li<hg@chrisli.org>
2005-05-17 01:12:30 -08:00
mpm@selenic.com
f16efef9d1
Add "HG: merge resolve" to editor text for merge
2005-05-17 01:07:57 -08:00
mpm@selenic.com
619ec7bc34
Fix bug in lazymap code
...
Add a sanity check to addgroup
2005-05-17 01:07:01 -08:00
mpm@selenic.com
1bf1e8bf4c
Add lazy{parser,index,map} to speed up processing of index files
2005-05-17 00:33:22 -08:00
mpm@selenic.com
8dcd538ef7
Fix a bug in patches() if there's not text and no patch
2005-05-17 00:32:18 -08:00
mpm@selenic.com
00b4996d46
Change revlog to use new patch code
2005-05-16 22:10:02 -08:00
mpm@selenic.com
f161c8bdc8
Add an O(m + nlog n) patching extension
2005-05-16 22:08:33 -08:00
mpm@selenic.com
e56388d1b4
Add mdiff.patches to speed up applying thousands of patches to the manifest
2005-05-14 10:27:14 -08:00
mpm@selenic.com
7c6f4b49c8
Add tag support
2005-05-13 13:12:32 -08:00
mpm@selenic.com
d9094f35ef
Fix up a bunch of bugs in the new merge code
...
Move getchangegroup/addchangegroup to generators
2005-05-13 11:47:16 -08:00
mpm@selenic.com
264f689db9
Diff in subdirectories from Jake Edge
...
Dates in diff
Fix O(n^2) behaviour of manifest diff
Add a/ and b/ to work with patch -p1
2005-05-12 17:54:55 -08:00
mpm@selenic.com
f6de60c79e
Add hg:// protocol
...
Fix some of the getchangegroup logic
2005-05-12 01:21:58 -08:00
mpm@selenic.com
27770f7f5d
Add getchangegroup code to efficiently calculate and request a changegroup
2005-05-11 15:06:41 -08:00
mpm@selenic.com
1171a0a7b6
From: Thomas Arendsen Hein <thomas@intevation.de>
...
Good. Attached is a patch which also tries to use $EMAIL as the
commit user and removed a try/except by using os.environ.get.
2005-05-11 14:38:26 -08:00
mpm@selenic.com
40a6faf20b
Fix resolve bug putting unchanged files in resolve cset
2005-05-11 09:44:12 -08:00
mpm@selenic.com
8bd85e1add
Add changegroup support
2005-05-10 00:40:49 -08:00
mpm@selenic.com
22ff07bd9b
Fix recursion depth trouble with ancestor algorithm
2005-05-10 00:34:57 -08:00
mpm@selenic.com
af712781e7
Fix occassional diff bug with manifests
2005-05-10 00:33:48 -08:00
mpm@selenic.com
60afa3551c
Attempt to recover journal automatically
2005-05-10 00:32:05 -08:00