mpm@selenic.com
a9d4acea6a
Pass filename to $HGMERGE
...
This lets the merge program be slightly more user-friendly
2005-05-24 23:34:06 -08:00
mpm@selenic.com
0616f6d8db
Improve pruning of branches in outstanding changeset algorithm
...
These changes make the client keep track of what it's seen more
carefully to avoid some redundant requests.
2005-05-24 23:13:25 -08:00
mpm@selenic.com
dba1a9fc73
A new ancestor algorithm
...
The old ancestor algorithm could get fooled into returning ancestors
closer to root than it ought to. Hopefully this one, which strictly
orders its search by distance from room, will be foolproof.
2005-05-24 23:11:44 -08:00
mpm@selenic.com
cbe151d218
Handle merge with deletions
...
If you merge with a repo that has deleted a file after editing it, hg
attempted to resolve the file. This (correctly) resulted in hg verify
errors because the resolved version didn't show up in the manifests.
This moves the manifest resolution before file resolution and decides
which files to resolve based on the (partially) resolved manifest.
After files are resolved, the final manifest is committed.
2005-05-24 20:30:35 -08:00
mpm@selenic.com
1bdc9f0c42
Minor fixes to verify
2005-05-24 20:29:38 -08:00
jake@edge2.net
579f538a2d
fixed problem with head/body tags, added dtd, fixed table attributes
...
add quotes around all attributes (w3c recommendation)
pages pass w3c validator
2005-05-24 16:08:09 -07:00
jake@edge2.net
8778053fe5
changed pos to rev for changelog cmd, changed & to ;
2005-05-24 07:42:05 -07:00
jake@edge2.net
1802614df3
hgweb is no longer a script
2005-05-24 07:33:12 -07:00
mpm@selenic.com
a2b716acff
Fix transaction handling bug by reverting fileopener change
2005-05-23 22:14:41 -08:00
mpm@selenic.com
27835c58e5
Fix pos in navbar
...
Fix bad parent link in changelog
2005-05-23 21:15:36 -08:00
mpm@selenic.com
e4397937b5
Prettify the web interface
...
Add header, footer templates
Add null parent handling
Combine files and directories
Add parity flag for alternating line colors
Add line numbers to filerevision
2005-05-23 20:57:48 -08:00
mpm@selenic.com
12c3bda8c3
Simple script to recompress a log file
2005-05-23 16:06:25 -08:00
mpm@selenic.com
84eb10c391
Minor safety checks to manifest diff
2005-05-23 16:05:48 -08:00
mpm@selenic.com
75fe869ada
Minor updates to comparison
2005-05-23 16:05:05 -08:00
mpm@selenic.com
61d83d35a2
Revamped templated hgweb
2005-05-23 16:00:02 -08:00
mpm@selenic.com
97321927a5
Merge from hgweb
2005-05-22 08:13:38 -08:00
jake@edge2.net
74291d2018
added annotate
...
fixed error page to get tmpl_dir
2005-05-21 22:43:14 -07:00
jake@edge2.net
3e268da5fc
change template to a generator
...
add write call to output generator
2005-05-21 20:31:54 -07:00
mpm@selenic.com
6ff7eab053
Make hg diff handle files that have been added but not yet committed.
2005-05-21 17:26:44 -08:00
mpm@selenic.com
ffa51818f8
Fix diff and export not showing added files
2005-05-21 17:03:12 -08:00
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
mpm@selenic.com
e7e047fdee
Add safety checking to mpatch
2005-05-21 13:14:58 -08: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
c60061b78a
Remove debugoldmerge command
2005-05-20 17:47:13 -08:00
mpm@selenic.com
04245ab9dc
hg history: don't print file list without -v switch
2005-05-20 17:46:47 -08:00
mpm@selenic.com
3ede7375ba
Subdir support for annotate
2005-05-20 17:45:03 -08:00
mpm@selenic.com
d35617bec8
Use revlog.delta and mdiff.patchtext to massively speed up processing
...
of manifests. This lets us verify a 28k changeset kernel repo in under
two minutes.
2005-05-20 17:44:34 -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
cb09188319
Add script for doing conversion of repo from oldstyle to newstyle
2005-05-20 17:28:09 -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
3157c9afd4
Don't diff unknown files
...
Fix syntax error from log date
2005-05-18 17:37:49 -08:00
mpm@selenic.com
b5d9923ebe
Date on its own line in file log
2005-05-18 17:33:46 -08:00
mpm@selenic.com
b4850f98ce
Pull from hg://edge2.net/hg/cmds
2005-05-18 17:29:10 -08:00
mpm@selenic.com
f6768fd49c
Merge from hgweb
2005-05-18 17:06:07 -08:00
