mpm@selenic.com [Fri, 27 May 2005 12:27:46 -0800] rev 178
Merge from Jake's hg docs
jake@edge2.net [Fri, 27 May 2005 07:16:58 -0700] rev 177
adding doc directory and files
mpm@selenic.com [Fri, 27 May 2005 12:26:14 -0800] rev 176
Change hg: protocol name to http: and http: to old-http:
hg: will continue to work for a bit
old-http: will be phased out soon
mpm@selenic.com [Thu, 26 May 2005 23:39:42 -0800] rev 175
hg: remove some debug commands, improve help messages, add .hgpaths file
.hgpaths is a file with lines of the form:
<symbolic name> <repository path or url>
that allows you to do:
hg merge <name>
mpm@selenic.com [Thu, 26 May 2005 22:54:48 -0800] rev 174
hg merge: abort if there are outstanding changes in the working directory
We currently don't support merging from the tip into the working
directory, so merge with outstanding local changes is asking for
trouble.
mpm@selenic.com [Thu, 26 May 2005 22:47:43 -0800] rev 173
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com [Thu, 26 May 2005 20:37:05 -0800] rev 172
hgweb: alternating colors for multifile diffs
mpm@selenic.com [Thu, 26 May 2005 18:20:24 -0800] rev 171
trivial tweak to merge3
mpm@selenic.com [Thu, 26 May 2005 13:02:28 -0800] rev 170
hg diff: fix missing final newline bug
mpm@selenic.com [Thu, 26 May 2005 13:02:04 -0800] rev 169
hgweb: actually commit the tags template
mpm@selenic.com [Thu, 26 May 2005 12:24:01 -0800] rev 168
hgweb: add tags links and manifest links
This adds a simple new tags page to browse by tag, adds the tag link
everywhere, and adds manifest links to the tags and changelog pages.
mpm@selenic.com [Thu, 26 May 2005 11:15:05 -0800] rev 167
Hide most revision numbers in hgweb
mpm@selenic.com [Thu, 26 May 2005 10:11:05 -0800] rev 166
hgweb: don't blow up on search for unknown keys
mpm@selenic.com [Thu, 26 May 2005 10:08:47 -0800] rev 165
Add tag/rev/node search to hgweb
mpm@selenic.com [Thu, 26 May 2005 09:56:20 -0800] rev 164
Make fancyopts handle no arguments
This lets hg serve work with no args.
mpm@selenic.com [Thu, 26 May 2005 09:48:50 -0800] rev 163
Make undo and recover friendlier
Add them to the help display, have them report failure
mpm@selenic.com [Thu, 26 May 2005 09:04:54 -0800] rev 162
Implement recover and undo commands
This adds an interface to transaction to rollback with a given journal file
and commands to rollback an existing .hg/journal or .hg/undo.
mpm@selenic.com [Thu, 26 May 2005 08:53:04 -0800] rev 161
Simply repository locking
This is a first pass at implementing repo locking. Next up, journal
recovery and undo.
mpm@selenic.com [Wed, 25 May 2005 16:40:22 -0800] rev 160
Update the README a bit
mpm@selenic.com [Wed, 25 May 2005 16:28:23 -0800] rev 159
Add example CGI script
This gives an example of how to easily use hgweb via CGI
mpm@selenic.com [Wed, 25 May 2005 16:27:10 -0800] rev 158
Add 'hg serve' command for stand-alone server
This adds a simple stand-alone web server mode to hg that exports the
current repo for merging and browsing. The default port is 8000.
mpm@selenic.com [Wed, 25 May 2005 16:21:06 -0800] rev 157
Install the templates where they can be found by hgweb.py
This ought to use package_data but that doesn't exist in Python 2.3.
So we do a hack of install_data and use glob.
This also adds templatepath() to hgweb.py which finds the templates
relative to hgweb.py's location.
mpm@selenic.com [Wed, 25 May 2005 09:04:38 -0800] rev 156
Fix some broken parent links in hgweb
mpm@selenic.com [Wed, 25 May 2005 08:54:54 -0800] rev 155
Merge from hgweb
jake@edge2.net [Tue, 24 May 2005 16:08:09 -0700] rev 154
fixed problem with head/body tags, added dtd, fixed table attributes
add quotes around all attributes (w3c recommendation)
pages pass w3c validator
jake@edge2.net [Tue, 24 May 2005 07:42:05 -0700] rev 153
changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net [Tue, 24 May 2005 07:33:12 -0700] rev 152
hgweb is no longer a script
mpm@selenic.com [Wed, 25 May 2005 08:53:34 -0800] rev 151
Bail on attempts to do an empty commit
mpm@selenic.com [Wed, 25 May 2005 08:53:01 -0800] rev 150
Add options to annotate for user/rev/changeset
This eliminates the blame command and makes annotate more flexible.
mpm@selenic.com [Tue, 24 May 2005 23:34:06 -0800] rev 149
Pass filename to $HGMERGE
This lets the merge program be slightly more user-friendly
mpm@selenic.com [Tue, 24 May 2005 23:13:25 -0800] rev 148
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.
mpm@selenic.com [Tue, 24 May 2005 23:11:44 -0800] rev 147
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.
mpm@selenic.com [Tue, 24 May 2005 20:30:35 -0800] rev 146
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.
mpm@selenic.com [Tue, 24 May 2005 20:29:38 -0800] rev 145
Minor fixes to verify
mpm@selenic.com [Mon, 23 May 2005 22:14:41 -0800] rev 144
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com [Mon, 23 May 2005 21:15:36 -0800] rev 143
Fix pos in navbar
Fix bad parent link in changelog
mpm@selenic.com [Mon, 23 May 2005 20:57:48 -0800] rev 142
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
mpm@selenic.com [Mon, 23 May 2005 16:06:25 -0800] rev 141
Simple script to recompress a log file
mpm@selenic.com [Mon, 23 May 2005 16:05:48 -0800] rev 140
Minor safety checks to manifest diff
mpm@selenic.com [Mon, 23 May 2005 16:05:05 -0800] rev 139
Minor updates to comparison
mpm@selenic.com [Mon, 23 May 2005 16:00:02 -0800] rev 138
Revamped templated hgweb
mpm@selenic.com [Sun, 22 May 2005 08:13:38 -0800] rev 137
Merge from hgweb
jake@edge2.net [Sat, 21 May 2005 22:43:14 -0700] rev 136
added annotate
fixed error page to get tmpl_dir
jake@edge2.net [Sat, 21 May 2005 20:31:54 -0700] rev 135
change template to a generator
add write call to output generator
jake@edge2.net [Sat, 21 May 2005 16:21:16 -0700] rev 134
fix problem with non wrapping file list
fix file list not appearing in checkin
jake@edge2.net [Sat, 21 May 2005 16:13:42 -0700] rev 133
added template support for some hgweb output, also, template files for
the parts that have been converted
jake@edge2.net [Sat, 21 May 2005 11:46:16 -0700] rev 132
making hgweb class
jake@edge2.net [Sat, 21 May 2005 11:35:26 -0700] rev 131
moving hgweb to mercurial subdir
mpm@selenic.com [Sat, 21 May 2005 17:26:44 -0800] rev 130
Make hg diff handle files that have been added but not yet committed.
mpm@selenic.com [Sat, 21 May 2005 17:03:12 -0800] rev 129
Fix diff and export not showing added files
mpm@selenic.com [Sat, 21 May 2005 13:14:58 -0800] rev 128
Add safety checking to mpatch
mpm@selenic.com [Fri, 20 May 2005 19:19:25 -0800] rev 127
Fix braindamaged import in mdiff.
mpm@selenic.com [Fri, 20 May 2005 17:50:11 -0800] rev 126
Remove some debugging code from lazyparser
mpm@selenic.com [Fri, 20 May 2005 17:49:25 -0800] rev 125
Remove python version of the patches code
mpm@selenic.com [Fri, 20 May 2005 17:47:13 -0800] rev 124
Remove debugoldmerge command
mpm@selenic.com [Fri, 20 May 2005 17:46:47 -0800] rev 123
hg history: don't print file list without -v switch
mpm@selenic.com [Fri, 20 May 2005 17:45:03 -0800] rev 122
Subdir support for annotate
mpm@selenic.com [Fri, 20 May 2005 17:44:34 -0800] rev 121
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.
mpm@selenic.com [Fri, 20 May 2005 17:42:29 -0800] rev 120
Add a function to return the new text from a binary diff
mpm@selenic.com [Fri, 20 May 2005 17:40:24 -0800] rev 119
Add code to retrieve or construct a revlog delta
mpm@selenic.com [Fri, 20 May 2005 17:38:01 -0800] rev 118
Add fileopener to move some pathname knowledge from filelog to repository
mpm@selenic.com [Fri, 20 May 2005 17:36:02 -0800] rev 117
Make revision code slightly faster
mpm@selenic.com [Fri, 20 May 2005 17:35:20 -0800] rev 116
Only use lazy indexing for big indices and avoid the overhead of the
lazy index in the small index case.
mpm@selenic.com [Fri, 20 May 2005 17:34:04 -0800] rev 115
Make lazyindex load slightly faster
mpm@selenic.com [Fri, 20 May 2005 17:33:24 -0800] rev 114
Simplify checkout slightly, replace checkdir with os.makedirs
mpm@selenic.com [Fri, 20 May 2005 17:31:55 -0800] rev 113
Sort files on check-in for good I/O patterns
mpm@selenic.com [Fri, 20 May 2005 17:31:12 -0800] rev 112
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
mpm@selenic.com [Fri, 20 May 2005 17:28:09 -0800] rev 111
Add script for doing conversion of repo from oldstyle to newstyle
mpm@selenic.com [Fri, 20 May 2005 17:27:21 -0800] rev 110
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.
mpm@selenic.com [Fri, 20 May 2005 17:22:02 -0800] rev 109
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.
mpm@selenic.com [Fri, 20 May 2005 17:20:39 -0800] rev 108
Warn if we fail to truncate something
mpm@selenic.com [Wed, 18 May 2005 18:25:37 -0800] rev 107
Make prompting go
Minor UI tweaking
Add merge prompting
mpm@selenic.com [Wed, 18 May 2005 17:37:49 -0800] rev 106
Don't diff unknown files
Fix syntax error from log date
mpm@selenic.com [Wed, 18 May 2005 17:33:46 -0800] rev 105
Date on its own line in file log
mpm@selenic.com [Wed, 18 May 2005 17:29:10 -0800] rev 104
Pull from hg://edge2.net/hg/cmds
jake@edge2.net [Sun, 15 May 2005 15:30:36 -0700] rev 103
adding subdir support for log and status commands
mpm@selenic.com [Wed, 18 May 2005 17:06:07 -0800] rev 102
Merge from hgweb
jake@edge2.net [Tue, 17 May 2005 16:03:50 -0700] rev 101
added pagination for changes (front) page
added manifest list
added file history
jake@edge2.net [Fri, 13 May 2005 17:48:10 -0700] rev 100
reorganize code into classes
clean up html code for w3c validation
jake@edge2.net [Fri, 13 May 2005 17:27:14 -0700] rev 99
making change list be reverse ordered
adding link to revision in change list
changing revision links to display checkin
mpm@selenic.com [Wed, 18 May 2005 16:59:54 -0800] rev 98
Add paranoia to diff code
mpm@selenic.com [Wed, 18 May 2005 16:47:49 -0800] rev 97
Add iterator to the lazymap code
mpm@selenic.com [Wed, 18 May 2005 16:45:44 -0800] rev 96
Add updated merge3 code
mpm@selenic.com [Wed, 18 May 2005 16:31:51 -0800] rev 95
Beginnings of transaction undo support
mpm@selenic.com [Wed, 18 May 2005 16:29:39 -0800] rev 94
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
mpm@selenic.com [Wed, 18 May 2005 15:24:18 -0800] rev 93
Fix two bugs in verify
mpm@selenic.com [Wed, 18 May 2005 15:23:10 -0800] rev 92
Add debugindexdot to generate graphviz dot files from indexes
mpm@selenic.com [Wed, 18 May 2005 15:21:53 -0800] rev 91
hack so that debugindex takes filenames
mpm@selenic.com [Tue, 17 May 2005 13:38:21 -0800] rev 90
Fix manifest merge swap bug
Add more debug info to merge
mpm@selenic.com [Tue, 17 May 2005 13:37:15 -0800] rev 89
Add tip command
mpm@selenic.com [Tue, 17 May 2005 12:40:24 -0800] rev 88
Missing newline in "requesting changegroup"
mpm@selenic.com [Tue, 17 May 2005 12:23:53 -0800] rev 87
Verify improvements:
Check existence of parents of changesets and manifests
Count errors
Use ui for display
Catch and count unpack exceptions
Print error count and exit with non-zero status on error
mpm@selenic.com [Tue, 17 May 2005 12:20:29 -0800] rev 86
Friendlier exceptions for unknown node errors
mpm@selenic.com [Tue, 17 May 2005 11:40:45 -0800] rev 85
Fix merge bug, I hope
mpm@selenic.com [Tue, 17 May 2005 11:40:26 -0800] rev 84
More useful message on broken addgroup chain
mpm@selenic.com [Tue, 17 May 2005 11:06:59 -0800] rev 83
Add -q quiet option
Make -d and -v do something
Add a bunch of debug and note messages
mpm@selenic.com [Tue, 17 May 2005 10:13:00 -0800] rev 82
Gotos are embarrassing.
mpm@selenic.com [Tue, 17 May 2005 01:27:14 -0800] rev 81
Add annotate and blame to the command list and README
mpm@selenic.com [Tue, 17 May 2005 01:22:50 -0800] rev 80
Fix field width for annotate
Add blame
mpm@selenic.com [Tue, 17 May 2005 01:12:30 -0800] rev 79
Add basic annotation support
filelog.annotate() will get the change number on each line.
Singed-Off-by: Christopher Li<hg@chrisli.org>
mpm@selenic.com [Tue, 17 May 2005 01:07:57 -0800] rev 78
Add "HG: merge resolve" to editor text for merge
mpm@selenic.com [Tue, 17 May 2005 01:07:01 -0800] rev 77
Fix bug in lazymap code
Add a sanity check to addgroup
mpm@selenic.com [Tue, 17 May 2005 00:33:22 -0800] rev 76
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com [Tue, 17 May 2005 00:32:18 -0800] rev 75
Fix a bug in patches() if there's not text and no patch
mpm@selenic.com [Tue, 17 May 2005 00:30:01 -0800] rev 74
(none)
mpm@selenic.com [Mon, 16 May 2005 22:10:02 -0800] rev 73
Change revlog to use new patch code
mpm@selenic.com [Mon, 16 May 2005 22:08:33 -0800] rev 72
Add an O(m + nlog n) patching extension
mpm@selenic.com [Sat, 14 May 2005 10:27:14 -0800] rev 71
Add mdiff.patches to speed up applying thousands of patches to the manifest
mpm@selenic.com [Sat, 14 May 2005 10:13:49 -0800] rev 70
Fix debugindex formatting for large repos
mpm@selenic.com [Fri, 13 May 2005 18:22:08 -0800] rev 69
Minor changes to import so that we can successfully import Ingo's
kernel history patchset.
mpm@selenic.com [Fri, 13 May 2005 13:26:00 -0800] rev 68
Print changeset metadata for export
mpm@selenic.com [Fri, 13 May 2005 13:12:32 -0800] rev 67
Add tag support
mpm@selenic.com [Fri, 13 May 2005 12:44:11 -0800] rev 66
Beginnings of changelog tagging
mpm@selenic.com [Fri, 13 May 2005 11:47:16 -0800] rev 65
Fix up a bunch of bugs in the new merge code
Move getchangegroup/addchangegroup to generators
mpm@selenic.com [Thu, 12 May 2005 17:54:55 -0800] rev 64
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
mpm@selenic.com [Thu, 12 May 2005 01:23:51 -0800] rev 63
Minor changes for release 0.4e
mpm@selenic.com [Thu, 12 May 2005 01:23:26 -0800] rev 62
Fix tabs
Update version number
Set new merge as the default
mpm@selenic.com [Thu, 12 May 2005 01:22:37 -0800] rev 61
Add server side of hg:// protocol to hgweb
mpm@selenic.com [Thu, 12 May 2005 01:21:58 -0800] rev 60
Add hg:// protocol
Fix some of the getchangegroup logic
mpm@selenic.com [Thu, 12 May 2005 01:20:43 -0800] rev 59
Minor corrections